kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update Qt to 4.7.2.

Browse source 
- Backport QSslCertificate patch.
This commit is contained in:
Alberto Villa 2011-03-25 09:54:16 +00:00
parent 7d204cf1c4
commit b140da0491
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=271640
18 changed files with 182 additions and 476 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/bsd.qt.mk
View file

@ -149,7 +149,7 @@ QTCGFLIBS?=
# QT4 version # QT4 version
# Don't forget to update ${PORTSDIR}/devel/qt4/files/patch-configure ! # Don't forget to update ${PORTSDIR}/devel/qt4/files/patch-configure !
# #
QT4_VERSION?= 4.7.1 QT4_VERSION?= 4.7.2
_QT_COMPONENTS_ALL= accessible assistant assistant-adp assistantclient \ _QT_COMPONENTS_ALL= accessible assistant assistant-adp assistantclient \
clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \ clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \

1
databases/qt4-mysql-plugin/Makefile
View file

@ -8,7 +8,6 @@
PORTNAME= qt4-${DB}-plugin PORTNAME= qt4-${DB}-plugin
DISTVERSION= ${QT4_VERSION} DISTVERSION= ${QT4_VERSION}
PORTREVISION= 1
CATEGORIES= databases CATEGORIES= databases
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org

1
databases/qt4-pgsql-plugin/Makefile
View file

@ -7,7 +7,6 @@
# #
PORTNAME= qt4-${DB}-plugin PORTNAME= qt4-${DB}-plugin
PORTREVISION= 1
DISTVERSION= ${QT4_VERSION} DISTVERSION= ${QT4_VERSION}
CATEGORIES= databases CATEGORIES= databases

46
databases/qt4-pgsql-plugin/files/patch-qsql_psql.cpp
View file

@ -1,46 +0,0 @@
--- ./src/sql/drivers/psql/qsql_psql.cpp 2010-09-10 11:05:25.000000000 +0200
+++ ./src/sql/drivers/psql/qsql_psql.cpp 2010-11-03 12:37:55.966977333 +0100
@@ -661,6 +661,17 @@
break;
}
break;
+ case 9:
+ switch (vMin) {
+ case 0:
+ serverVersion = QPSQLDriver::Version9;
+ break;
+ default:
+ serverVersion = QPSQLDriver::Version9;
+ break;
+ }
+ break;
+
default:
break;
}
@@ -852,7 +863,8 @@
// This hack can dissapear once there is an API to query this sort of information.
if (d->pro == QPSQLDriver::Version8 ||
d->pro == QPSQLDriver::Version81 ||
- d->pro == QPSQLDriver::Version82) {
+ d->pro == QPSQLDriver::Version82 ||
+ d->pro == QPSQLDriver::Version9) {
transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0;
}
@@ -963,6 +975,7 @@
case QPSQLDriver::Version8:
case QPSQLDriver::Version81:
case QPSQLDriver::Version82:
+ case QPSQLDriver::Version9:
stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
"pg_class.relname "
"FROM pg_attribute, pg_class "
@@ -1046,6 +1059,7 @@
case QPSQLDriver::Version8:
case QPSQLDriver::Version81:
case QPSQLDriver::Version82:
+ case QPSQLDriver::Version9:
stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
"pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
"pg_attrdef.adsrc "

12
databases/qt4-pgsql-plugin/files/patch-qsql_psql.h
View file

@ -1,12 +0,0 @@
--- ./src/sql/drivers/psql/qsql_psql.h 2010-09-10 11:05:25.000000000 +0200
+++ ./src/sql/drivers/psql/qsql_psql.h 2010-11-03 12:36:16.380310668 +0100
@@ -104,7 +104,8 @@
Version74 = 10,
Version8 = 11,
Version81 = 12,
- Version82 = 13
+ Version82 = 13,
+ Version9 = 14
};
explicit QPSQLDriver(QObject *parent=0);

4
devel/qmake4/pkg-plist
View file

@ -19,6 +19,7 @@ share/qt4/mkspecs/common/mac-llvm.conf
share/qt4/mkspecs/common/mac.conf share/qt4/mkspecs/common/mac.conf
share/qt4/mkspecs/common/posix/qplatformdefs.h share/qt4/mkspecs/common/posix/qplatformdefs.h
share/qt4/mkspecs/common/qws.conf share/qt4/mkspecs/common/qws.conf
share/qt4/mkspecs/common/symbian/appCaptionForTranslation.cpp
share/qt4/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h share/qt4/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h
share/qt4/mkspecs/common/symbian/header-wrappers/AknDoc.h share/qt4/mkspecs/common/symbian/header-wrappers/AknDoc.h
share/qt4/mkspecs/common/symbian/header-wrappers/AknFontAccess.h share/qt4/mkspecs/common/symbian/header-wrappers/AknFontAccess.h
@ -38,6 +39,7 @@ share/qt4/mkspecs/common/symbian/header-wrappers/ApDataHandler.h
share/qt4/mkspecs/common/symbian/header-wrappers/ApUtils.h share/qt4/mkspecs/common/symbian/header-wrappers/ApUtils.h
share/qt4/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h share/qt4/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h
share/qt4/mkspecs/common/symbian/header-wrappers/DocumentHandler.h share/qt4/mkspecs/common/symbian/header-wrappers/DocumentHandler.h
share/qt4/mkspecs/common/symbian/packageNameForTranslation.cpp
share/qt4/mkspecs/common/symbian/qplatformdefs.h share/qt4/mkspecs/common/symbian/qplatformdefs.h
share/qt4/mkspecs/common/symbian/stl-off/new share/qt4/mkspecs/common/symbian/stl-off/new
share/qt4/mkspecs/common/symbian/symbian-makefile.conf share/qt4/mkspecs/common/symbian/symbian-makefile.conf
@ -87,6 +89,7 @@ share/qt4/mkspecs/features/qtestlib.prf
share/qt4/mkspecs/features/qtopia.prf share/qt4/mkspecs/features/qtopia.prf
share/qt4/mkspecs/features/qtopiainc.prf share/qt4/mkspecs/features/qtopiainc.prf
share/qt4/mkspecs/features/qtopialib.prf share/qt4/mkspecs/features/qtopialib.prf
share/qt4/mkspecs/features/qttest_p4.prf
share/qt4/mkspecs/features/release.prf share/qt4/mkspecs/features/release.prf
share/qt4/mkspecs/features/resources.prf share/qt4/mkspecs/features/resources.prf
share/qt4/mkspecs/features/shared.prf share/qt4/mkspecs/features/shared.prf
@ -105,6 +108,7 @@ share/qt4/mkspecs/features/symbian/default_post.prf
share/qt4/mkspecs/features/symbian/default_pre.prf share/qt4/mkspecs/features/symbian/default_pre.prf
share/qt4/mkspecs/features/symbian/do_not_build_as_thumb.prf share/qt4/mkspecs/features/symbian/do_not_build_as_thumb.prf
share/qt4/mkspecs/features/symbian/epocallowdlldata.prf share/qt4/mkspecs/features/symbian/epocallowdlldata.prf
share/qt4/mkspecs/features/symbian/localize_deployment.prf
share/qt4/mkspecs/features/symbian/moc.prf share/qt4/mkspecs/features/symbian/moc.prf
share/qt4/mkspecs/features/symbian/nested_exceptions.prf share/qt4/mkspecs/features/symbian/nested_exceptions.prf
share/qt4/mkspecs/features/symbian/opengl.prf share/qt4/mkspecs/features/symbian/opengl.prf

3
devel/qt4-corelib/Makefile
View file

@ -63,7 +63,8 @@ pre-configure:
post-configure: post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile -e 's|.*$$(QMAKE).*||g' \
${BUILD_WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \

14
devel/qt4-corelib/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig 2010-05-10 13:47:34.842989306 +0200 --- ./configure.orig 2011-03-09 01:18:35.443096016 +0100
+++ configure 2010-05-10 13:51:54.767296452 +0200 +++ ./configure 2011-03-09 01:17:30.423222843 +0100
@@ -6291,7 +6291,6 @@ @@ -6617,7 +6617,6 @@
QT_CONFIG="$QT_CONFIG phonon-backend" QT_CONFIG="$QT_CONFIG phonon-backend"
fi fi
else else
@ -8,7 +8,7 @@
fi fi
# disable accessibility # disable accessibility
@@ -6343,7 +6342,6 @@ @@ -6671,7 +6670,6 @@
# enable opengl # enable opengl
if [ "$CFG_OPENGL" = "no" ]; then if [ "$CFG_OPENGL" = "no" ]; then
@ -16,7 +16,7 @@
else else
QT_CONFIG="$QT_CONFIG opengl" QT_CONFIG="$QT_CONFIG opengl"
fi fi
@@ -6812,7 +6810,6 @@ @@ -7172,7 +7170,6 @@
if [ "$CFG_XMLPATTERNS" = "yes" ]; then if [ "$CFG_XMLPATTERNS" = "yes" ]; then
QT_CONFIG="$QT_CONFIG xmlpatterns" QT_CONFIG="$QT_CONFIG xmlpatterns"
else else
@ -24,7 +24,7 @@
fi fi
if [ "$CFG_MULTIMEDIA" = "no" ]; then if [ "$CFG_MULTIMEDIA" = "no" ]; then
@@ -7364,10 +7361,8 @@ @@ -7772,10 +7769,8 @@
[ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG" [ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG"
[ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB"
[ "$CFG_S60" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_S60" [ "$CFG_S60" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_S60"
@ -35,7 +35,7 @@
if [ "$PLATFORM_QWS" != "yes" ]; then if [ "$PLATFORM_QWS" != "yes" ]; then
[ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
@@ -7376,35 +7371,21 @@ @@ -7785,35 +7780,21 @@
fi fi
# X11/Unix/Mac only configs # X11/Unix/Mac only configs

153
devel/qt4-corelib/files/patch-kqueue
View file

@ -1,153 +0,0 @@
--- src/corelib/io/qfilesystemwatcher_kqueue.cpp.orig 2010-11-06 04:55:18.000000000 +0300
+++ src/corelib/io/qfilesystemwatcher_kqueue.cpp 2010-11-11 00:05:11.550910992 +0300
@@ -133,6 +133,14 @@
perror("QKqueueFileSystemWatcherEngine::addPaths: open");
continue;
}
+ if (fd >= FD_SETSIZE / 2 && fd < FD_SETSIZE) {
+ int fddup = fcntl(fd, F_DUPFD, FD_SETSIZE);
+ if (fddup != -1) {
+ ::close(fd);
+ fd = fddup;
+ }
+ }
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
QT_STATBUF st;
if (QT_FSTAT(fd, &st) == -1) {
@@ -157,7 +165,7 @@
EV_SET(&kev,
fd,
EVFILT_VNODE,
- EV_ADD | EV_ENABLE | EV_ONESHOT,
+ EV_ADD | EV_ENABLE | EV_CLEAR,
NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | NOTE_RENAME | NOTE_REVOKE,
0,
0);
@@ -180,6 +188,8 @@
idToPath.insert(id, path);
}
+ locker.unlock();
+
if (!isRunning())
start();
else
@@ -203,19 +213,7 @@
if (x.isEmpty() || x != path)
continue;
- int fd = id < 0 ? -id : id;
- struct kevent kev;
- EV_SET(&kev,
- fd,
- EVFILT_VNODE,
- EV_DELETE,
- NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | NOTE_RENAME | NOTE_REVOKE,
- 0,
- 0);
- if (kevent(kqfd, &kev, 1, 0, 0, 0) == -1) {
- perror("QKqueueFileSystemWatcherEngine::removeWatch: kevent");
- }
- ::close(fd);
+ ::close(id < 0 ? -id : id);
it.remove();
if (id < 0)
@@ -225,11 +223,11 @@
}
if (pathToID.isEmpty()) {
- stop();
locker.unlock();
+ stop();
wait();
- locker.relock();
} else {
+ locker.unlock();
write(kqpipe[1], "@", 1);
}
@@ -243,19 +241,18 @@
void QKqueueFileSystemWatcherEngine::run()
{
- static const struct timespec ZeroTimeout = { 0, 0 };
-
forever {
struct kevent kev;
DEBUG() << "QKqueueFileSystemWatcherEngine: waiting for kevents...";
int r = kevent(kqfd, 0, 0, &kev, 1, 0);
if (r < 0) {
+ if(errno == EINTR) {
+ DEBUG() << "QKqueueFileSystemWatcherEngine: kevent call was interrupted, restarting...";
+ continue;
+ }
perror("QKqueueFileSystemWatcherEngine: error during kevent wait");
return;
- }
-
- QMutexLocker locker(&mutex);
- do {
+ } else {
int fd = kev.ident;
DEBUG() << "QKqueueFileSystemWatcherEngine: processing kevent" << kev.ident << kev.filter;
@@ -287,6 +284,8 @@
break;
}
} else {
+ QMutexLocker locker(&mutex);
+
int id = fd;
QString path = idToPath.value(id);
if (path.isEmpty()) {
@@ -295,12 +294,12 @@
path = idToPath.value(id);
if (path.isEmpty()) {
DEBUG() << "QKqueueFileSystemWatcherEngine: received a kevent for a file we're not watching";
- goto process_next_event;
+ continue;
}
}
if (kev.filter != EVFILT_VNODE) {
DEBUG() << "QKqueueFileSystemWatcherEngine: received a kevent with the wrong filter";
- goto process_next_event;
+ continue;
}
if ((kev.fflags & (NOTE_DELETE | NOTE_REVOKE | NOTE_RENAME)) != 0) {
@@ -315,31 +314,15 @@
else
emit fileChanged(path, true);
} else {
- DEBUG() << path << "changed, re-enabling watch";
+ DEBUG() << path << "changed";
if (id < 0)
emit directoryChanged(path, false);
else
emit fileChanged(path, false);
-
- // renable the watch
- EV_SET(&kev,
- fd,
- EVFILT_VNODE,
- EV_ADD | EV_ENABLE | EV_ONESHOT,
- NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | NOTE_RENAME | NOTE_REVOKE,
- 0,
- 0);
- if (kevent(kqfd, &kev, 1, 0, 0, 0) == -1) {
- perror("QKqueueFileSystemWatcherEngine::processKqueueEvents: kevent EV_ADD");
- }
}
}
-
- // are there any more?
-process_next_event:
- r = kevent(kqfd, 0, 0, &kev, 1, &ZeroTimeout);
- } while (r > 0);
+ }
}
}

4
devel/qt4/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (KDE/qt-everywhere-opensource-src-4.7.1.tar.gz) = 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a SHA256 (KDE/qt-everywhere-opensource-src-4.7.2.tar.gz) = d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
SIZE (KDE/qt-everywhere-opensource-src-4.7.1.tar.gz) = 211768512 SIZE (KDE/qt-everywhere-opensource-src-4.7.2.tar.gz) = 213663032

9
devel/qt4/files/Makefile.options
View file

@ -1,5 +1,10 @@
#qt4-corelib and qt4-gui must recompiled both when changing options # For (almost?) any QT_NO_* setting in QCONFIG_FLAGS (see the
QT4_OPTIONS_ALL=CUPS QGTKSTYLE NAS # configure script), qt4-corelib adds to qconfig.h a conditional check
# made to disable by default (i.e., if it wasn't explicitly turned on)
# the related feature. QT4_OPTIONS are required to tweak qconfig.h
# without making qt4-corelib depend on useless stuff. Both qt4-corelib
# and qt4-gui must be recompiled when changing options.
QT4_OPTIONS_ALL=CUPS NAS QGTKSTYLE
QT4_OPTIONS?= QT4_OPTIONS?=
.if defined(PACKAGE_BUILDING) .if defined(PACKAGE_BUILDING)
QT4_OPTIONS+= CUPS QT4_OPTIONS+= CUPS

25
devel/qt4/files/patch-configure
View file

@ -1,6 +1,15 @@
--- configure.old 2010-09-10 05:04:46.000000000 -0400 --- ./configure.orig 2011-03-05 18:49:09.908552467 +0100
+++ configure 2010-09-28 00:52:09.000000000 -0400 +++ ./configure 2011-03-05 18:51:40.918572488 +0100
@@ -2351,11 +2351,6 @@ @@ -796,7 +796,7 @@
CFG_SILENT=no
CFG_GRAPHICS_SYSTEM=default
CFG_RUNTIME_SYSTEM=
-CFG_ALSA=auto
+CFG_ALSA=no
CFG_PULSEAUDIO=auto
CFG_COREWLAN=auto
CFG_ICD=auto
@@ -2445,11 +2445,6 @@
fi fi
done done
@ -10,9 +19,9 @@
- ln -s "$relpath"/mkspecs/* "$outpath/mkspecs" - ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
- rm -f "$outpath/mkspecs/default" - rm -f "$outpath/mkspecs/default"
# Special case for mkspecs/features directory. ShadowMkspecs()
# To be able to place .prf files into a shadow build directory, {
@@ -2394,7 +2389,7 @@ @@ -2495,7 +2490,7 @@
# find a make command # find a make command
if [ -z "$MAKE" ]; then if [ -z "$MAKE" ]; then
MAKE= MAKE=
@ -21,7 +30,7 @@
if "$WHICH" $mk >/dev/null 2>&1; then if "$WHICH" $mk >/dev/null 2>&1; then
MAKE=`"$WHICH" $mk` MAKE=`"$WHICH" $mk`
break break
@@ -4466,7 +4461,7 @@ @@ -4596,7 +4591,7 @@
} }
# build qmake # build qmake
@ -30,7 +39,7 @@
echo "Creating qmake. Please wait..." echo "Creating qmake. Please wait..."
OLD_QCONFIG_H= OLD_QCONFIG_H=
@@ -5391,14 +5386,6 @@ @@ -5564,14 +5559,6 @@
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
fi fi

239
misc/qt4-doc/pkg-plist
View file

@ -58,12 +58,6 @@
%%DOCSDIR%%/html/all-examples.html %%DOCSDIR%%/html/all-examples.html
%%DOCSDIR%%/html/animation-animatedtiles-animatedtiles-pro.html %%DOCSDIR%%/html/animation-animatedtiles-animatedtiles-pro.html
%%DOCSDIR%%/html/animation-animatedtiles-animatedtiles-qrc.html %%DOCSDIR%%/html/animation-animatedtiles-animatedtiles-qrc.html
%%DOCSDIR%%/html/animation-animatedtiles-images-centered-png.html
%%DOCSDIR%%/html/animation-animatedtiles-images-ellipse-png.html
%%DOCSDIR%%/html/animation-animatedtiles-images-figure8-png.html
%%DOCSDIR%%/html/animation-animatedtiles-images-kinetic-png.html
%%DOCSDIR%%/html/animation-animatedtiles-images-random-png.html
%%DOCSDIR%%/html/animation-animatedtiles-images-tile-png.html
%%DOCSDIR%%/html/animation-animatedtiles-main-cpp.html %%DOCSDIR%%/html/animation-animatedtiles-main-cpp.html
%%DOCSDIR%%/html/animation-animatedtiles.html %%DOCSDIR%%/html/animation-animatedtiles.html
%%DOCSDIR%%/html/animation-appchooser-appchooser-pro.html %%DOCSDIR%%/html/animation-appchooser-appchooser-pro.html
@ -74,7 +68,6 @@
%%DOCSDIR%%/html/animation-easing-easing-pro.html %%DOCSDIR%%/html/animation-easing-easing-pro.html
%%DOCSDIR%%/html/animation-easing-easing-qrc.html %%DOCSDIR%%/html/animation-easing-easing-qrc.html
%%DOCSDIR%%/html/animation-easing-form-ui.html %%DOCSDIR%%/html/animation-easing-form-ui.html
%%DOCSDIR%%/html/animation-easing-images-qt-logo-png.html
%%DOCSDIR%%/html/animation-easing-main-cpp.html %%DOCSDIR%%/html/animation-easing-main-cpp.html
%%DOCSDIR%%/html/animation-easing-window-cpp.html %%DOCSDIR%%/html/animation-easing-window-cpp.html
%%DOCSDIR%%/html/animation-easing-window-h.html %%DOCSDIR%%/html/animation-easing-window-h.html
@ -130,6 +123,7 @@
%%DOCSDIR%%/html/commercialedition.html %%DOCSDIR%%/html/commercialedition.html
%%DOCSDIR%%/html/compatclasses.html %%DOCSDIR%%/html/compatclasses.html
%%DOCSDIR%%/html/compiler-notes.html %%DOCSDIR%%/html/compiler-notes.html
%%DOCSDIR%%/html/configure-options.html
%%DOCSDIR%%/html/containers.html %%DOCSDIR%%/html/containers.html
%%DOCSDIR%%/html/coordsys.html %%DOCSDIR%%/html/coordsys.html
%%DOCSDIR%%/html/credits.html %%DOCSDIR%%/html/credits.html
@ -185,15 +179,11 @@
%%DOCSDIR%%/html/dbus-remotecontrolledcar.html %%DOCSDIR%%/html/dbus-remotecontrolledcar.html
%%DOCSDIR%%/html/debug.html %%DOCSDIR%%/html/debug.html
%%DOCSDIR%%/html/declarative-animation-basics-color-animation-qml.html %%DOCSDIR%%/html/declarative-animation-basics-color-animation-qml.html
%%DOCSDIR%%/html/declarative-animation-basics-images-face-smile-png.html
%%DOCSDIR%%/html/declarative-animation-basics-images-moon-png.html
%%DOCSDIR%%/html/declarative-animation-basics-images-shadow-png.html
%%DOCSDIR%%/html/declarative-animation-basics-images-star-png.html
%%DOCSDIR%%/html/declarative-animation-basics-images-sun-png.html
%%DOCSDIR%%/html/declarative-animation-basics-property-animation-qml.html %%DOCSDIR%%/html/declarative-animation-basics-property-animation-qml.html
%%DOCSDIR%%/html/declarative-animation-basics.html %%DOCSDIR%%/html/declarative-animation-basics.html
%%DOCSDIR%%/html/declarative-animation-behaviors-behavior-example-qml.html %%DOCSDIR%%/html/declarative-animation-behaviors-behavior-example-qml.html
%%DOCSDIR%%/html/declarative-animation-behaviors-siderect-qml.html %%DOCSDIR%%/html/declarative-animation-behaviors-siderect-qml.html
%%DOCSDIR%%/html/declarative-animation-behaviors-wigglytext-qml.html
%%DOCSDIR%%/html/declarative-animation-behaviors.html %%DOCSDIR%%/html/declarative-animation-behaviors.html
%%DOCSDIR%%/html/declarative-animation-easing-content-quitbutton-qml.html %%DOCSDIR%%/html/declarative-animation-easing-content-quitbutton-qml.html
%%DOCSDIR%%/html/declarative-animation-easing-easing-qml.html %%DOCSDIR%%/html/declarative-animation-easing-easing-qml.html
@ -436,13 +426,6 @@
%%DOCSDIR%%/html/declarative-toys-corkboards-day-qml.html %%DOCSDIR%%/html/declarative-toys-corkboards-day-qml.html
%%DOCSDIR%%/html/declarative-toys-corkboards.html %%DOCSDIR%%/html/declarative-toys-corkboards.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-dynamicscene-qml.html %%DOCSDIR%%/html/declarative-toys-dynamicscene-dynamicscene-qml.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-images-face-smile-png.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-images-moon-png.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-images-rabbit-brown-png.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-images-rabbit-bw-png.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-images-star-png.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-images-sun-png.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-images-tree-s-png.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-qml-button-qml.html %%DOCSDIR%%/html/declarative-toys-dynamicscene-qml-button-qml.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-qml-genericsceneitem-qml.html %%DOCSDIR%%/html/declarative-toys-dynamicscene-qml-genericsceneitem-qml.html
%%DOCSDIR%%/html/declarative-toys-dynamicscene-qml-itemcreation-js.html %%DOCSDIR%%/html/declarative-toys-dynamicscene-qml-itemcreation-js.html
@ -536,9 +519,6 @@
%%DOCSDIR%%/html/declarative-ui-components-scrollbar-main-qml.html %%DOCSDIR%%/html/declarative-ui-components-scrollbar-main-qml.html
%%DOCSDIR%%/html/declarative-ui-components-scrollbar-scrollbar-qml.html %%DOCSDIR%%/html/declarative-ui-components-scrollbar-scrollbar-qml.html
%%DOCSDIR%%/html/declarative-ui-components-scrollbar.html %%DOCSDIR%%/html/declarative-ui-components-scrollbar.html
%%DOCSDIR%%/html/declarative-ui-components-searchbox-images-clear-png.html
%%DOCSDIR%%/html/declarative-ui-components-searchbox-images-lineedit-bg-focus-png.html
%%DOCSDIR%%/html/declarative-ui-components-searchbox-images-lineedit-bg-png.html
%%DOCSDIR%%/html/declarative-ui-components-searchbox-main-qml.html %%DOCSDIR%%/html/declarative-ui-components-searchbox-main-qml.html
%%DOCSDIR%%/html/declarative-ui-components-searchbox-searchbox-qml.html %%DOCSDIR%%/html/declarative-ui-components-searchbox-searchbox-qml.html
%%DOCSDIR%%/html/declarative-ui-components-searchbox.html %%DOCSDIR%%/html/declarative-ui-components-searchbox.html
@ -573,7 +553,6 @@
%%DOCSDIR%%/html/demos-books-bookwindow-cpp.html %%DOCSDIR%%/html/demos-books-bookwindow-cpp.html
%%DOCSDIR%%/html/demos-books-bookwindow-h.html %%DOCSDIR%%/html/demos-books-bookwindow-h.html
%%DOCSDIR%%/html/demos-books-bookwindow-ui.html %%DOCSDIR%%/html/demos-books-bookwindow-ui.html
%%DOCSDIR%%/html/demos-books-images-star-png.html
%%DOCSDIR%%/html/demos-books-initdb-h.html %%DOCSDIR%%/html/demos-books-initdb-h.html
%%DOCSDIR%%/html/demos-books-main-cpp.html %%DOCSDIR%%/html/demos-books-main-cpp.html
%%DOCSDIR%%/html/demos-books.html %%DOCSDIR%%/html/demos-books.html
@ -823,9 +802,6 @@
%%DOCSDIR%%/html/demos-gradients-gradients-qrc.html %%DOCSDIR%%/html/demos-gradients-gradients-qrc.html
%%DOCSDIR%%/html/demos-gradients-main-cpp.html %%DOCSDIR%%/html/demos-gradients-main-cpp.html
%%DOCSDIR%%/html/demos-gradients.html %%DOCSDIR%%/html/demos-gradients.html
%%DOCSDIR%%/html/demos-interview-images-folder-png.html
%%DOCSDIR%%/html/demos-interview-images-interview-png.html
%%DOCSDIR%%/html/demos-interview-images-services-png.html
%%DOCSDIR%%/html/demos-interview-interview-pro.html %%DOCSDIR%%/html/demos-interview-interview-pro.html
%%DOCSDIR%%/html/demos-interview-interview-qrc.html %%DOCSDIR%%/html/demos-interview-interview-qrc.html
%%DOCSDIR%%/html/demos-interview-main-cpp.html %%DOCSDIR%%/html/demos-interview-main-cpp.html
@ -852,7 +828,6 @@
%%DOCSDIR%%/html/demos-pathstroke-pathstroke-pro.html %%DOCSDIR%%/html/demos-pathstroke-pathstroke-pro.html
%%DOCSDIR%%/html/demos-pathstroke-pathstroke-qrc.html %%DOCSDIR%%/html/demos-pathstroke-pathstroke-qrc.html
%%DOCSDIR%%/html/demos-pathstroke.html %%DOCSDIR%%/html/demos-pathstroke.html
%%DOCSDIR%%/html/demos-qmediaplayer-images-screen-png.html
%%DOCSDIR%%/html/demos-qmediaplayer-main-cpp.html %%DOCSDIR%%/html/demos-qmediaplayer-main-cpp.html
%%DOCSDIR%%/html/demos-qmediaplayer-mediaplayer-cpp.html %%DOCSDIR%%/html/demos-qmediaplayer-mediaplayer-cpp.html
%%DOCSDIR%%/html/demos-qmediaplayer-mediaplayer-h.html %%DOCSDIR%%/html/demos-qmediaplayer-mediaplayer-h.html
@ -921,7 +896,6 @@
%%DOCSDIR%%/html/demos-spectrum-app-wavfile-h.html %%DOCSDIR%%/html/demos-spectrum-app-wavfile-h.html
%%DOCSDIR%%/html/demos-spectrum-spectrum-pro.html %%DOCSDIR%%/html/demos-spectrum-spectrum-pro.html
%%DOCSDIR%%/html/demos-spectrum.html %%DOCSDIR%%/html/demos-spectrum.html
%%DOCSDIR%%/html/demos-spreadsheet-images-interview-png.html
%%DOCSDIR%%/html/demos-spreadsheet-main-cpp.html %%DOCSDIR%%/html/demos-spreadsheet-main-cpp.html
%%DOCSDIR%%/html/demos-spreadsheet-printview-cpp.html %%DOCSDIR%%/html/demos-spreadsheet-printview-cpp.html
%%DOCSDIR%%/html/demos-spreadsheet-printview-h.html %%DOCSDIR%%/html/demos-spreadsheet-printview-h.html
@ -987,45 +961,6 @@
%%DOCSDIR%%/html/demos-sub-attaq-torpedo-cpp.html %%DOCSDIR%%/html/demos-sub-attaq-torpedo-cpp.html
%%DOCSDIR%%/html/demos-sub-attaq-torpedo-h.html %%DOCSDIR%%/html/demos-sub-attaq-torpedo-h.html
%%DOCSDIR%%/html/demos-sub-attaq.html %%DOCSDIR%%/html/demos-sub-attaq.html
%%DOCSDIR%%/html/demos-textedit-images-logo32-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-editcopy-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-editcut-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-editpaste-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-editredo-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-editundo-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-exportpdf-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-filenew-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-fileopen-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-fileprint-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-filesave-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-textbold-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-textcenter-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-textitalic-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-textjustify-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-textleft-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-textright-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-textunder-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-zoomin-png.html
%%DOCSDIR%%/html/demos-textedit-images-mac-zoomout-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-editcopy-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-editcut-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-editpaste-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-editredo-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-editundo-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-exportpdf-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-filenew-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-fileopen-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-fileprint-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-filesave-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-textbold-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-textcenter-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-textitalic-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-textjustify-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-textleft-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-textright-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-textunder-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-zoomin-png.html
%%DOCSDIR%%/html/demos-textedit-images-win-zoomout-png.html
%%DOCSDIR%%/html/demos-textedit-main-cpp.html %%DOCSDIR%%/html/demos-textedit-main-cpp.html
%%DOCSDIR%%/html/demos-textedit-textedit-cpp.html %%DOCSDIR%%/html/demos-textedit-textedit-cpp.html
%%DOCSDIR%%/html/demos-textedit-textedit-h.html %%DOCSDIR%%/html/demos-textedit-textedit-h.html
@ -1143,22 +1078,12 @@
%%DOCSDIR%%/html/dialogs-classwizard-classwizard-h.html %%DOCSDIR%%/html/dialogs-classwizard-classwizard-h.html
%%DOCSDIR%%/html/dialogs-classwizard-classwizard-pro.html %%DOCSDIR%%/html/dialogs-classwizard-classwizard-pro.html
%%DOCSDIR%%/html/dialogs-classwizard-classwizard-qrc.html %%DOCSDIR%%/html/dialogs-classwizard-classwizard-qrc.html
%%DOCSDIR%%/html/dialogs-classwizard-images-background-png.html
%%DOCSDIR%%/html/dialogs-classwizard-images-banner-png.html
%%DOCSDIR%%/html/dialogs-classwizard-images-logo1-png.html
%%DOCSDIR%%/html/dialogs-classwizard-images-logo2-png.html
%%DOCSDIR%%/html/dialogs-classwizard-images-logo3-png.html
%%DOCSDIR%%/html/dialogs-classwizard-images-watermark1-png.html
%%DOCSDIR%%/html/dialogs-classwizard-images-watermark2-png.html
%%DOCSDIR%%/html/dialogs-classwizard-main-cpp.html %%DOCSDIR%%/html/dialogs-classwizard-main-cpp.html
%%DOCSDIR%%/html/dialogs-classwizard.html %%DOCSDIR%%/html/dialogs-classwizard.html
%%DOCSDIR%%/html/dialogs-configdialog-configdialog-cpp.html %%DOCSDIR%%/html/dialogs-configdialog-configdialog-cpp.html
%%DOCSDIR%%/html/dialogs-configdialog-configdialog-h.html %%DOCSDIR%%/html/dialogs-configdialog-configdialog-h.html
%%DOCSDIR%%/html/dialogs-configdialog-configdialog-pro.html %%DOCSDIR%%/html/dialogs-configdialog-configdialog-pro.html
%%DOCSDIR%%/html/dialogs-configdialog-configdialog-qrc.html %%DOCSDIR%%/html/dialogs-configdialog-configdialog-qrc.html
%%DOCSDIR%%/html/dialogs-configdialog-images-config-png.html
%%DOCSDIR%%/html/dialogs-configdialog-images-query-png.html
%%DOCSDIR%%/html/dialogs-configdialog-images-update-png.html
%%DOCSDIR%%/html/dialogs-configdialog-main-cpp.html %%DOCSDIR%%/html/dialogs-configdialog-main-cpp.html
%%DOCSDIR%%/html/dialogs-configdialog-pages-cpp.html %%DOCSDIR%%/html/dialogs-configdialog-pages-cpp.html
%%DOCSDIR%%/html/dialogs-configdialog-pages-h.html %%DOCSDIR%%/html/dialogs-configdialog-pages-h.html
@ -1173,8 +1098,6 @@
%%DOCSDIR%%/html/dialogs-findfiles-window-cpp.html %%DOCSDIR%%/html/dialogs-findfiles-window-cpp.html
%%DOCSDIR%%/html/dialogs-findfiles-window-h.html %%DOCSDIR%%/html/dialogs-findfiles-window-h.html
%%DOCSDIR%%/html/dialogs-findfiles.html %%DOCSDIR%%/html/dialogs-findfiles.html
%%DOCSDIR%%/html/dialogs-licensewizard-images-logo-png.html
%%DOCSDIR%%/html/dialogs-licensewizard-images-watermark-png.html
%%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-cpp.html %%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-cpp.html
%%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-h.html %%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-h.html
%%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-pro.html %%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-pro.html
@ -1203,7 +1126,6 @@
%%DOCSDIR%%/html/dnd.html %%DOCSDIR%%/html/dnd.html
%%DOCSDIR%%/html/draganddrop-delayedencoding-delayedencoding-pro.html %%DOCSDIR%%/html/draganddrop-delayedencoding-delayedencoding-pro.html
%%DOCSDIR%%/html/draganddrop-delayedencoding-delayedencoding-qrc.html %%DOCSDIR%%/html/draganddrop-delayedencoding-delayedencoding-qrc.html
%%DOCSDIR%%/html/draganddrop-delayedencoding-images-drag-png.html
%%DOCSDIR%%/html/draganddrop-delayedencoding-images-example-svg.html %%DOCSDIR%%/html/draganddrop-delayedencoding-images-example-svg.html
%%DOCSDIR%%/html/draganddrop-delayedencoding-main-cpp.html %%DOCSDIR%%/html/draganddrop-delayedencoding-main-cpp.html
%%DOCSDIR%%/html/draganddrop-delayedencoding-mimedata-cpp.html %%DOCSDIR%%/html/draganddrop-delayedencoding-mimedata-cpp.html
@ -1215,9 +1137,6 @@
%%DOCSDIR%%/html/draganddrop-draggableicons-draggableicons-qrc.html %%DOCSDIR%%/html/draganddrop-draggableicons-draggableicons-qrc.html
%%DOCSDIR%%/html/draganddrop-draggableicons-dragwidget-cpp.html %%DOCSDIR%%/html/draganddrop-draggableicons-dragwidget-cpp.html
%%DOCSDIR%%/html/draganddrop-draggableicons-dragwidget-h.html %%DOCSDIR%%/html/draganddrop-draggableicons-dragwidget-h.html
%%DOCSDIR%%/html/draganddrop-draggableicons-images-boat-png.html
%%DOCSDIR%%/html/draganddrop-draggableicons-images-car-png.html
%%DOCSDIR%%/html/draganddrop-draggableicons-images-house-png.html
%%DOCSDIR%%/html/draganddrop-draggableicons-main-cpp.html %%DOCSDIR%%/html/draganddrop-draggableicons-main-cpp.html
%%DOCSDIR%%/html/draganddrop-draggableicons.html %%DOCSDIR%%/html/draganddrop-draggableicons.html
%%DOCSDIR%%/html/draganddrop-draggabletext-draggabletext-pro.html %%DOCSDIR%%/html/draganddrop-draggabletext-draggabletext-pro.html
@ -1261,14 +1180,6 @@
%%DOCSDIR%%/html/effects-blurpicker-blurpicker-h.html %%DOCSDIR%%/html/effects-blurpicker-blurpicker-h.html
%%DOCSDIR%%/html/effects-blurpicker-blurpicker-pro.html %%DOCSDIR%%/html/effects-blurpicker-blurpicker-pro.html
%%DOCSDIR%%/html/effects-blurpicker-blurpicker-qrc.html %%DOCSDIR%%/html/effects-blurpicker-blurpicker-qrc.html
%%DOCSDIR%%/html/effects-blurpicker-images-accessories-calculator-png.html
%%DOCSDIR%%/html/effects-blurpicker-images-accessories-text-editor-png.html
%%DOCSDIR%%/html/effects-blurpicker-images-help-browser-png.html
%%DOCSDIR%%/html/effects-blurpicker-images-internet-group-chat-png.html
%%DOCSDIR%%/html/effects-blurpicker-images-internet-mail-png.html
%%DOCSDIR%%/html/effects-blurpicker-images-internet-web-browser-png.html
%%DOCSDIR%%/html/effects-blurpicker-images-office-calendar-png.html
%%DOCSDIR%%/html/effects-blurpicker-images-system-users-png.html
%%DOCSDIR%%/html/effects-blurpicker-main-cpp.html %%DOCSDIR%%/html/effects-blurpicker-main-cpp.html
%%DOCSDIR%%/html/effects-blurpicker.html %%DOCSDIR%%/html/effects-blurpicker.html
%%DOCSDIR%%/html/effects-fademessage-fademessage-cpp.html %%DOCSDIR%%/html/effects-fademessage-fademessage-cpp.html
@ -1350,7 +1261,6 @@
%%DOCSDIR%%/html/graphicsview-api.html %%DOCSDIR%%/html/graphicsview-api.html
%%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-basicgraphicslayouts-pro.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-basicgraphicslayouts-pro.html
%%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-basicgraphicslayouts-qrc.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-basicgraphicslayouts-qrc.html
%%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-images-block-png.html
%%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-layoutitem-cpp.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-layoutitem-cpp.html
%%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-layoutitem-h.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-layoutitem-h.html
%%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-main-cpp.html %%DOCSDIR%%/html/graphicsview-basicgraphicslayouts-main-cpp.html
@ -1373,21 +1283,6 @@
%%DOCSDIR%%/html/graphicsview-diagramscene-diagramscene-qrc.html %%DOCSDIR%%/html/graphicsview-diagramscene-diagramscene-qrc.html
%%DOCSDIR%%/html/graphicsview-diagramscene-diagramtextitem-cpp.html %%DOCSDIR%%/html/graphicsview-diagramscene-diagramtextitem-cpp.html
%%DOCSDIR%%/html/graphicsview-diagramscene-diagramtextitem-h.html %%DOCSDIR%%/html/graphicsview-diagramscene-diagramtextitem-h.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-background1-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-background2-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-background3-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-background4-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-bold-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-bringtofront-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-delete-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-floodfill-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-italic-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-linecolor-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-linepointer-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-pointer-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-sendtoback-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-textpointer-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-images-underline-png.html
%%DOCSDIR%%/html/graphicsview-diagramscene-main-cpp.html %%DOCSDIR%%/html/graphicsview-diagramscene-main-cpp.html
%%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-cpp.html %%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-cpp.html
%%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-h.html %%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-h.html
@ -1395,7 +1290,6 @@
%%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-cpp.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-cpp.html
%%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-h.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-h.html
%%DOCSDIR%%/html/graphicsview-dragdroprobot-dragdroprobot-pro.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-dragdroprobot-pro.html
%%DOCSDIR%%/html/graphicsview-dragdroprobot-images-head-png.html
%%DOCSDIR%%/html/graphicsview-dragdroprobot-main-cpp.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-main-cpp.html
%%DOCSDIR%%/html/graphicsview-dragdroprobot-robot-cpp.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-robot-cpp.html
%%DOCSDIR%%/html/graphicsview-dragdroprobot-robot-h.html %%DOCSDIR%%/html/graphicsview-dragdroprobot-robot-h.html
@ -1420,14 +1314,6 @@
%%DOCSDIR%%/html/graphicsview-padnavigator-flippablepad-cpp.html %%DOCSDIR%%/html/graphicsview-padnavigator-flippablepad-cpp.html
%%DOCSDIR%%/html/graphicsview-padnavigator-flippablepad-h.html %%DOCSDIR%%/html/graphicsview-padnavigator-flippablepad-h.html
%%DOCSDIR%%/html/graphicsview-padnavigator-form-ui.html %%DOCSDIR%%/html/graphicsview-padnavigator-form-ui.html
%%DOCSDIR%%/html/graphicsview-padnavigator-images-artsfftscope-png.html
%%DOCSDIR%%/html/graphicsview-padnavigator-images-kontact-contacts-png.html
%%DOCSDIR%%/html/graphicsview-padnavigator-images-kontact-journal-png.html
%%DOCSDIR%%/html/graphicsview-padnavigator-images-kontact-mail-png.html
%%DOCSDIR%%/html/graphicsview-padnavigator-images-kontact-notes-png.html
%%DOCSDIR%%/html/graphicsview-padnavigator-images-kopeteavailable-png.html
%%DOCSDIR%%/html/graphicsview-padnavigator-images-metacontact-online-png.html
%%DOCSDIR%%/html/graphicsview-padnavigator-images-minitools-png.html
%%DOCSDIR%%/html/graphicsview-padnavigator-main-cpp.html %%DOCSDIR%%/html/graphicsview-padnavigator-main-cpp.html
%%DOCSDIR%%/html/graphicsview-padnavigator-padnavigator-cpp.html %%DOCSDIR%%/html/graphicsview-padnavigator-padnavigator-cpp.html
%%DOCSDIR%%/html/graphicsview-padnavigator-padnavigator-h.html %%DOCSDIR%%/html/graphicsview-padnavigator-padnavigator-h.html
@ -1463,7 +1349,6 @@
%%DOCSDIR%%/html/graphicsview-simpleanchorlayout-main-cpp.html %%DOCSDIR%%/html/graphicsview-simpleanchorlayout-main-cpp.html
%%DOCSDIR%%/html/graphicsview-simpleanchorlayout-simpleanchorlayout-pro.html %%DOCSDIR%%/html/graphicsview-simpleanchorlayout-simpleanchorlayout-pro.html
%%DOCSDIR%%/html/graphicsview-simpleanchorlayout.html %%DOCSDIR%%/html/graphicsview-simpleanchorlayout.html
%%DOCSDIR%%/html/graphicsview-weatheranchorlayout-images-weather-few-clouds-png.html
%%DOCSDIR%%/html/graphicsview-weatheranchorlayout-main-cpp.html %%DOCSDIR%%/html/graphicsview-weatheranchorlayout-main-cpp.html
%%DOCSDIR%%/html/graphicsview-weatheranchorlayout-weatheranchorlayout-pro.html %%DOCSDIR%%/html/graphicsview-weatheranchorlayout-weatheranchorlayout-pro.html
%%DOCSDIR%%/html/graphicsview-weatheranchorlayout-weatheranchorlayout-qrc.html %%DOCSDIR%%/html/graphicsview-weatheranchorlayout-weatheranchorlayout-qrc.html
@ -1767,6 +1652,7 @@
%%DOCSDIR%%/html/images/declarative-qmlfocus2.png %%DOCSDIR%%/html/images/declarative-qmlfocus2.png
%%DOCSDIR%%/html/images/declarative-qmlfocus3.png %%DOCSDIR%%/html/images/declarative-qmlfocus3.png
%%DOCSDIR%%/html/images/declarative-qmlfocus4.png %%DOCSDIR%%/html/images/declarative-qmlfocus4.png
%%DOCSDIR%%/html/images/declarative-qmlfocus5.png
%%DOCSDIR%%/html/images/declarative-qtlogo-preserveaspectcrop.png %%DOCSDIR%%/html/images/declarative-qtlogo-preserveaspectcrop.png
%%DOCSDIR%%/html/images/declarative-qtlogo-preserveaspectfit.png %%DOCSDIR%%/html/images/declarative-qtlogo-preserveaspectfit.png
%%DOCSDIR%%/html/images/declarative-qtlogo-stretch.png %%DOCSDIR%%/html/images/declarative-qtlogo-stretch.png
@ -2444,12 +2330,13 @@
%%DOCSDIR%%/html/images/qml-calculator-example.png %%DOCSDIR%%/html/images/qml-calculator-example.png
%%DOCSDIR%%/html/images/qml-clocks-example.png %%DOCSDIR%%/html/images/qml-clocks-example.png
%%DOCSDIR%%/html/images/qml-coloranim-example.png %%DOCSDIR%%/html/images/qml-coloranim-example.png
%%DOCSDIR%%/html/images/qml-context-tree.png %%DOCSDIR%%/html/images/qml-column.png
%%DOCSDIR%%/html/images/qml-corkboards-example.png %%DOCSDIR%%/html/images/qml-corkboards-example.png
%%DOCSDIR%%/html/images/qml-dial.png %%DOCSDIR%%/html/images/qml-dial.png
%%DOCSDIR%%/html/images/qml-dialcontrol-example.png %%DOCSDIR%%/html/images/qml-dialcontrol-example.png
%%DOCSDIR%%/html/images/qml-dynamicscene-example.png %%DOCSDIR%%/html/images/qml-dynamicscene-example.png
%%DOCSDIR%%/html/images/qml-easing-example.png %%DOCSDIR%%/html/images/qml-easing-example.png
%%DOCSDIR%%/html/images/qml-extending-types.png
%%DOCSDIR%%/html/images/qml-flickr-demo-small.png %%DOCSDIR%%/html/images/qml-flickr-demo-small.png
%%DOCSDIR%%/html/images/qml-flickr-demo.png %%DOCSDIR%%/html/images/qml-flickr-demo.png
%%DOCSDIR%%/html/images/qml-flipable-example.png %%DOCSDIR%%/html/images/qml-flipable-example.png
@ -3132,6 +3019,9 @@
%%DOCSDIR%%/html/images/weatherinfo-demo.png %%DOCSDIR%%/html/images/weatherinfo-demo.png
%%DOCSDIR%%/html/images/webkit-domtraversal.png %%DOCSDIR%%/html/images/webkit-domtraversal.png
%%DOCSDIR%%/html/images/webkit-examples.png %%DOCSDIR%%/html/images/webkit-examples.png
%%DOCSDIR%%/html/images/webkit-imageanalyzer-complete.png
%%DOCSDIR%%/html/images/webkit-imageanalyzer-progress.png
%%DOCSDIR%%/html/images/webkit-imageanalyzer-screenshot.png
%%DOCSDIR%%/html/images/webkit-simpleselector.png %%DOCSDIR%%/html/images/webkit-simpleselector.png
%%DOCSDIR%%/html/images/webview.png %%DOCSDIR%%/html/images/webview.png
%%DOCSDIR%%/html/images/whatsnewanimatedtiles.png %%DOCSDIR%%/html/images/whatsnewanimatedtiles.png
@ -3351,7 +3241,6 @@
%%DOCSDIR%%/html/itemviews-pixelator-imagemodel-cpp.html %%DOCSDIR%%/html/itemviews-pixelator-imagemodel-cpp.html
%%DOCSDIR%%/html/itemviews-pixelator-imagemodel-h.html %%DOCSDIR%%/html/itemviews-pixelator-imagemodel-h.html
%%DOCSDIR%%/html/itemviews-pixelator-images-qrc.html %%DOCSDIR%%/html/itemviews-pixelator-images-qrc.html
%%DOCSDIR%%/html/itemviews-pixelator-images-qt-png.html
%%DOCSDIR%%/html/itemviews-pixelator-main-cpp.html %%DOCSDIR%%/html/itemviews-pixelator-main-cpp.html
%%DOCSDIR%%/html/itemviews-pixelator-mainwindow-cpp.html %%DOCSDIR%%/html/itemviews-pixelator-mainwindow-cpp.html
%%DOCSDIR%%/html/itemviews-pixelator-mainwindow-h.html %%DOCSDIR%%/html/itemviews-pixelator-mainwindow-h.html
@ -3464,32 +3353,16 @@
%%DOCSDIR%%/html/mainwindow.html %%DOCSDIR%%/html/mainwindow.html
%%DOCSDIR%%/html/mainwindows-application-application-pro.html %%DOCSDIR%%/html/mainwindows-application-application-pro.html
%%DOCSDIR%%/html/mainwindows-application-application-qrc.html %%DOCSDIR%%/html/mainwindows-application-application-qrc.html
%%DOCSDIR%%/html/mainwindows-application-images-copy-png.html
%%DOCSDIR%%/html/mainwindows-application-images-cut-png.html
%%DOCSDIR%%/html/mainwindows-application-images-new-png.html
%%DOCSDIR%%/html/mainwindows-application-images-open-png.html
%%DOCSDIR%%/html/mainwindows-application-images-paste-png.html
%%DOCSDIR%%/html/mainwindows-application-images-save-png.html
%%DOCSDIR%%/html/mainwindows-application-main-cpp.html %%DOCSDIR%%/html/mainwindows-application-main-cpp.html
%%DOCSDIR%%/html/mainwindows-application-mainwindow-cpp.html %%DOCSDIR%%/html/mainwindows-application-mainwindow-cpp.html
%%DOCSDIR%%/html/mainwindows-application-mainwindow-h.html %%DOCSDIR%%/html/mainwindows-application-mainwindow-h.html
%%DOCSDIR%%/html/mainwindows-application.html %%DOCSDIR%%/html/mainwindows-application.html
%%DOCSDIR%%/html/mainwindows-dockwidgets-dockwidgets-pro.html %%DOCSDIR%%/html/mainwindows-dockwidgets-dockwidgets-pro.html
%%DOCSDIR%%/html/mainwindows-dockwidgets-dockwidgets-qrc.html %%DOCSDIR%%/html/mainwindows-dockwidgets-dockwidgets-qrc.html
%%DOCSDIR%%/html/mainwindows-dockwidgets-images-new-png.html
%%DOCSDIR%%/html/mainwindows-dockwidgets-images-print-png.html
%%DOCSDIR%%/html/mainwindows-dockwidgets-images-save-png.html
%%DOCSDIR%%/html/mainwindows-dockwidgets-images-undo-png.html
%%DOCSDIR%%/html/mainwindows-dockwidgets-main-cpp.html %%DOCSDIR%%/html/mainwindows-dockwidgets-main-cpp.html
%%DOCSDIR%%/html/mainwindows-dockwidgets-mainwindow-cpp.html %%DOCSDIR%%/html/mainwindows-dockwidgets-mainwindow-cpp.html
%%DOCSDIR%%/html/mainwindows-dockwidgets-mainwindow-h.html %%DOCSDIR%%/html/mainwindows-dockwidgets-mainwindow-h.html
%%DOCSDIR%%/html/mainwindows-dockwidgets.html %%DOCSDIR%%/html/mainwindows-dockwidgets.html
%%DOCSDIR%%/html/mainwindows-mdi-images-copy-png.html
%%DOCSDIR%%/html/mainwindows-mdi-images-cut-png.html
%%DOCSDIR%%/html/mainwindows-mdi-images-new-png.html
%%DOCSDIR%%/html/mainwindows-mdi-images-open-png.html
%%DOCSDIR%%/html/mainwindows-mdi-images-paste-png.html
%%DOCSDIR%%/html/mainwindows-mdi-images-save-png.html
%%DOCSDIR%%/html/mainwindows-mdi-main-cpp.html %%DOCSDIR%%/html/mainwindows-mdi-main-cpp.html
%%DOCSDIR%%/html/mainwindows-mdi-mainwindow-cpp.html %%DOCSDIR%%/html/mainwindows-mdi-mainwindow-cpp.html
%%DOCSDIR%%/html/mainwindows-mdi-mainwindow-h.html %%DOCSDIR%%/html/mainwindows-mdi-mainwindow-h.html
@ -3508,12 +3381,6 @@
%%DOCSDIR%%/html/mainwindows-recentfiles-mainwindow-h.html %%DOCSDIR%%/html/mainwindows-recentfiles-mainwindow-h.html
%%DOCSDIR%%/html/mainwindows-recentfiles-recentfiles-pro.html %%DOCSDIR%%/html/mainwindows-recentfiles-recentfiles-pro.html
%%DOCSDIR%%/html/mainwindows-recentfiles.html %%DOCSDIR%%/html/mainwindows-recentfiles.html
%%DOCSDIR%%/html/mainwindows-sdi-images-copy-png.html
%%DOCSDIR%%/html/mainwindows-sdi-images-cut-png.html
%%DOCSDIR%%/html/mainwindows-sdi-images-new-png.html
%%DOCSDIR%%/html/mainwindows-sdi-images-open-png.html
%%DOCSDIR%%/html/mainwindows-sdi-images-paste-png.html
%%DOCSDIR%%/html/mainwindows-sdi-images-save-png.html
%%DOCSDIR%%/html/mainwindows-sdi-main-cpp.html %%DOCSDIR%%/html/mainwindows-sdi-main-cpp.html
%%DOCSDIR%%/html/mainwindows-sdi-mainwindow-cpp.html %%DOCSDIR%%/html/mainwindows-sdi-mainwindow-cpp.html
%%DOCSDIR%%/html/mainwindows-sdi-mainwindow-h.html %%DOCSDIR%%/html/mainwindows-sdi-mainwindow-h.html
@ -3660,9 +3527,6 @@
%%DOCSDIR%%/html/network-qftp-ftp-qrc.html %%DOCSDIR%%/html/network-qftp-ftp-qrc.html
%%DOCSDIR%%/html/network-qftp-ftpwindow-cpp.html %%DOCSDIR%%/html/network-qftp-ftpwindow-cpp.html
%%DOCSDIR%%/html/network-qftp-ftpwindow-h.html %%DOCSDIR%%/html/network-qftp-ftpwindow-h.html
%%DOCSDIR%%/html/network-qftp-images-cdtoparent-png.html
%%DOCSDIR%%/html/network-qftp-images-dir-png.html
%%DOCSDIR%%/html/network-qftp-images-file-png.html
%%DOCSDIR%%/html/network-qftp-main-cpp.html %%DOCSDIR%%/html/network-qftp-main-cpp.html
%%DOCSDIR%%/html/network-qftp-qftp-pro.html %%DOCSDIR%%/html/network-qftp-qftp-pro.html
%%DOCSDIR%%/html/network-qftp.html %%DOCSDIR%%/html/network-qftp.html
@ -3794,12 +3658,6 @@
%%DOCSDIR%%/html/opengl-samplebuffers.html %%DOCSDIR%%/html/opengl-samplebuffers.html
%%DOCSDIR%%/html/opengl-textures-glwidget-cpp.html %%DOCSDIR%%/html/opengl-textures-glwidget-cpp.html
%%DOCSDIR%%/html/opengl-textures-glwidget-h.html %%DOCSDIR%%/html/opengl-textures-glwidget-h.html
%%DOCSDIR%%/html/opengl-textures-images-side1-png.html
%%DOCSDIR%%/html/opengl-textures-images-side2-png.html
%%DOCSDIR%%/html/opengl-textures-images-side3-png.html
%%DOCSDIR%%/html/opengl-textures-images-side4-png.html
%%DOCSDIR%%/html/opengl-textures-images-side5-png.html
%%DOCSDIR%%/html/opengl-textures-images-side6-png.html
%%DOCSDIR%%/html/opengl-textures-main-cpp.html %%DOCSDIR%%/html/opengl-textures-main-cpp.html
%%DOCSDIR%%/html/opengl-textures-textures-pro.html %%DOCSDIR%%/html/opengl-textures-textures-pro.html
%%DOCSDIR%%/html/opengl-textures-textures-qrc.html %%DOCSDIR%%/html/opengl-textures-textures-qrc.html
@ -3818,8 +3676,6 @@
%%DOCSDIR%%/html/painting-3d.html %%DOCSDIR%%/html/painting-3d.html
%%DOCSDIR%%/html/painting-basicdrawing-basicdrawing-pro.html %%DOCSDIR%%/html/painting-basicdrawing-basicdrawing-pro.html
%%DOCSDIR%%/html/painting-basicdrawing-basicdrawing-qrc.html %%DOCSDIR%%/html/painting-basicdrawing-basicdrawing-qrc.html
%%DOCSDIR%%/html/painting-basicdrawing-images-brick-png.html
%%DOCSDIR%%/html/painting-basicdrawing-images-qt-logo-png.html
%%DOCSDIR%%/html/painting-basicdrawing-main-cpp.html %%DOCSDIR%%/html/painting-basicdrawing-main-cpp.html
%%DOCSDIR%%/html/painting-basicdrawing-renderarea-cpp.html %%DOCSDIR%%/html/painting-basicdrawing-renderarea-cpp.html
%%DOCSDIR%%/html/painting-basicdrawing-renderarea-h.html %%DOCSDIR%%/html/painting-basicdrawing-renderarea-h.html
@ -3843,10 +3699,6 @@
%%DOCSDIR%%/html/painting-imagecomposition-imagecomposer-h.html %%DOCSDIR%%/html/painting-imagecomposition-imagecomposer-h.html
%%DOCSDIR%%/html/painting-imagecomposition-imagecomposition-pro.html %%DOCSDIR%%/html/painting-imagecomposition-imagecomposition-pro.html
%%DOCSDIR%%/html/painting-imagecomposition-imagecomposition-qrc.html %%DOCSDIR%%/html/painting-imagecomposition-imagecomposition-qrc.html
%%DOCSDIR%%/html/painting-imagecomposition-images-background-png.html
%%DOCSDIR%%/html/painting-imagecomposition-images-blackrectangle-png.html
%%DOCSDIR%%/html/painting-imagecomposition-images-butterfly-png.html
%%DOCSDIR%%/html/painting-imagecomposition-images-checker-png.html
%%DOCSDIR%%/html/painting-imagecomposition-main-cpp.html %%DOCSDIR%%/html/painting-imagecomposition-main-cpp.html
%%DOCSDIR%%/html/painting-imagecomposition.html %%DOCSDIR%%/html/painting-imagecomposition.html
%%DOCSDIR%%/html/painting-painterpaths-main-cpp.html %%DOCSDIR%%/html/painting-painterpaths-main-cpp.html
@ -3928,8 +3780,6 @@
%%DOCSDIR%%/html/phonon-overview.html %%DOCSDIR%%/html/phonon-overview.html
%%DOCSDIR%%/html/phonon-path-members.html %%DOCSDIR%%/html/phonon-path-members.html
%%DOCSDIR%%/html/phonon-path.html %%DOCSDIR%%/html/phonon-path.html
%%DOCSDIR%%/html/phonon-pulsesupport-members.html
%%DOCSDIR%%/html/phonon-pulsesupport.html
%%DOCSDIR%%/html/phonon-qmusicplayer-main-cpp.html %%DOCSDIR%%/html/phonon-qmusicplayer-main-cpp.html
%%DOCSDIR%%/html/phonon-qmusicplayer-mainwindow-cpp.html %%DOCSDIR%%/html/phonon-qmusicplayer-mainwindow-cpp.html
%%DOCSDIR%%/html/phonon-qmusicplayer-mainwindow-h.html %%DOCSDIR%%/html/phonon-qmusicplayer-mainwindow-h.html
@ -4625,8 +4475,6 @@
%%DOCSDIR%%/html/qdeclarativei18n.html %%DOCSDIR%%/html/qdeclarativei18n.html
%%DOCSDIR%%/html/qdeclarativeimageprovider-members.html %%DOCSDIR%%/html/qdeclarativeimageprovider-members.html
%%DOCSDIR%%/html/qdeclarativeimageprovider.html %%DOCSDIR%%/html/qdeclarativeimageprovider.html
%%DOCSDIR%%/html/qdeclarativeimportdatabase-members.html
%%DOCSDIR%%/html/qdeclarativeimportdatabase.html
%%DOCSDIR%%/html/qdeclarativeintroduction.html %%DOCSDIR%%/html/qdeclarativeintroduction.html
%%DOCSDIR%%/html/qdeclarativeitem-members.html %%DOCSDIR%%/html/qdeclarativeitem-members.html
%%DOCSDIR%%/html/qdeclarativeitem.html %%DOCSDIR%%/html/qdeclarativeitem.html
@ -4649,7 +4497,6 @@
%%DOCSDIR%%/html/qdeclarativepropertymap.html %%DOCSDIR%%/html/qdeclarativepropertymap.html
%%DOCSDIR%%/html/qdeclarativepropertyvaluesource-members.html %%DOCSDIR%%/html/qdeclarativepropertyvaluesource-members.html
%%DOCSDIR%%/html/qdeclarativepropertyvaluesource.html %%DOCSDIR%%/html/qdeclarativepropertyvaluesource.html
%%DOCSDIR%%/html/qdeclarativereference.html
%%DOCSDIR%%/html/qdeclarativescope.html %%DOCSDIR%%/html/qdeclarativescope.html
%%DOCSDIR%%/html/qdeclarativescriptstring-members.html %%DOCSDIR%%/html/qdeclarativescriptstring-members.html
%%DOCSDIR%%/html/qdeclarativescriptstring.html %%DOCSDIR%%/html/qdeclarativescriptstring.html
@ -5318,6 +5165,7 @@
%%DOCSDIR%%/html/qml-connections-members.html %%DOCSDIR%%/html/qml-connections-members.html
%%DOCSDIR%%/html/qml-connections.html %%DOCSDIR%%/html/qml-connections.html
%%DOCSDIR%%/html/qml-date.html %%DOCSDIR%%/html/qml-date.html
%%DOCSDIR%%/html/qml-double.html
%%DOCSDIR%%/html/qml-doublevalidator-members.html %%DOCSDIR%%/html/qml-doublevalidator-members.html
%%DOCSDIR%%/html/qml-doublevalidator.html %%DOCSDIR%%/html/qml-doublevalidator.html
%%DOCSDIR%%/html/qml-enumeration.html %%DOCSDIR%%/html/qml-enumeration.html
@ -5408,6 +5256,7 @@
%%DOCSDIR%%/html/qml-pathelement.html %%DOCSDIR%%/html/qml-pathelement.html
%%DOCSDIR%%/html/qml-pathline-members.html %%DOCSDIR%%/html/qml-pathline-members.html
%%DOCSDIR%%/html/qml-pathline.html %%DOCSDIR%%/html/qml-pathline.html
%%DOCSDIR%%/html/qml-pathpercent-members.html
%%DOCSDIR%%/html/qml-pathpercent.html %%DOCSDIR%%/html/qml-pathpercent.html
%%DOCSDIR%%/html/qml-pathquad-members.html %%DOCSDIR%%/html/qml-pathquad-members.html
%%DOCSDIR%%/html/qml-pathquad.html %%DOCSDIR%%/html/qml-pathquad.html
@ -5485,6 +5334,7 @@
%%DOCSDIR%%/html/qml-tutorial3.html %%DOCSDIR%%/html/qml-tutorial3.html
%%DOCSDIR%%/html/qml-url.html %%DOCSDIR%%/html/qml-url.html
%%DOCSDIR%%/html/qml-utility-elements.html %%DOCSDIR%%/html/qml-utility-elements.html
%%DOCSDIR%%/html/qml-variant.html
%%DOCSDIR%%/html/qml-vector3d.html %%DOCSDIR%%/html/qml-vector3d.html
%%DOCSDIR%%/html/qml-vector3danimation-members.html %%DOCSDIR%%/html/qml-vector3danimation-members.html
%%DOCSDIR%%/html/qml-vector3danimation.html %%DOCSDIR%%/html/qml-vector3danimation.html
@ -5502,6 +5352,7 @@
%%DOCSDIR%%/html/qml-xmllistmodel.html %%DOCSDIR%%/html/qml-xmllistmodel.html
%%DOCSDIR%%/html/qml-xmlrole-members.html %%DOCSDIR%%/html/qml-xmlrole-members.html
%%DOCSDIR%%/html/qml-xmlrole.html %%DOCSDIR%%/html/qml-xmlrole.html
%%DOCSDIR%%/html/qmlinuse.html
%%DOCSDIR%%/html/qmlruntime.html %%DOCSDIR%%/html/qmlruntime.html
%%DOCSDIR%%/html/qmlviewer.html %%DOCSDIR%%/html/qmlviewer.html
%%DOCSDIR%%/html/qmodelindex-members.html %%DOCSDIR%%/html/qmodelindex-members.html
@ -6825,12 +6676,6 @@
%%DOCSDIR%%/html/sql-drilldown-drilldown-qrc.html %%DOCSDIR%%/html/sql-drilldown-drilldown-qrc.html
%%DOCSDIR%%/html/sql-drilldown-imageitem-cpp.html %%DOCSDIR%%/html/sql-drilldown-imageitem-cpp.html
%%DOCSDIR%%/html/sql-drilldown-imageitem-h.html %%DOCSDIR%%/html/sql-drilldown-imageitem-h.html
%%DOCSDIR%%/html/sql-drilldown-images-beijing-png.html
%%DOCSDIR%%/html/sql-drilldown-images-berlin-png.html
%%DOCSDIR%%/html/sql-drilldown-images-brisbane-png.html
%%DOCSDIR%%/html/sql-drilldown-images-munich-png.html
%%DOCSDIR%%/html/sql-drilldown-images-oslo-png.html
%%DOCSDIR%%/html/sql-drilldown-images-redwood-png.html
%%DOCSDIR%%/html/sql-drilldown-informationwindow-cpp.html %%DOCSDIR%%/html/sql-drilldown-informationwindow-cpp.html
%%DOCSDIR%%/html/sql-drilldown-informationwindow-h.html %%DOCSDIR%%/html/sql-drilldown-informationwindow-h.html
%%DOCSDIR%%/html/sql-drilldown-main-cpp.html %%DOCSDIR%%/html/sql-drilldown-main-cpp.html
@ -6843,8 +6688,6 @@
%%DOCSDIR%%/html/sql-masterdetail-database-h.html %%DOCSDIR%%/html/sql-masterdetail-database-h.html
%%DOCSDIR%%/html/sql-masterdetail-dialog-cpp.html %%DOCSDIR%%/html/sql-masterdetail-dialog-cpp.html
%%DOCSDIR%%/html/sql-masterdetail-dialog-h.html %%DOCSDIR%%/html/sql-masterdetail-dialog-h.html
%%DOCSDIR%%/html/sql-masterdetail-images-icon-png.html
%%DOCSDIR%%/html/sql-masterdetail-images-image-png.html
%%DOCSDIR%%/html/sql-masterdetail-main-cpp.html %%DOCSDIR%%/html/sql-masterdetail-main-cpp.html
%%DOCSDIR%%/html/sql-masterdetail-mainwindow-cpp.html %%DOCSDIR%%/html/sql-masterdetail-mainwindow-cpp.html
%%DOCSDIR%%/html/sql-masterdetail-mainwindow-h.html %%DOCSDIR%%/html/sql-masterdetail-mainwindow-h.html
@ -7082,7 +6925,6 @@
%%DOCSDIR%%/html/tools-undoframework-diagramitem-h.html %%DOCSDIR%%/html/tools-undoframework-diagramitem-h.html
%%DOCSDIR%%/html/tools-undoframework-diagramscene-cpp.html %%DOCSDIR%%/html/tools-undoframework-diagramscene-cpp.html
%%DOCSDIR%%/html/tools-undoframework-diagramscene-h.html %%DOCSDIR%%/html/tools-undoframework-diagramscene-h.html
%%DOCSDIR%%/html/tools-undoframework-images-cross-png.html
%%DOCSDIR%%/html/tools-undoframework-main-cpp.html %%DOCSDIR%%/html/tools-undoframework-main-cpp.html
%%DOCSDIR%%/html/tools-undoframework-mainwindow-cpp.html %%DOCSDIR%%/html/tools-undoframework-mainwindow-cpp.html
%%DOCSDIR%%/html/tools-undoframework-mainwindow-h.html %%DOCSDIR%%/html/tools-undoframework-mainwindow-h.html
@ -7262,6 +7104,14 @@
%%DOCSDIR%%/html/webkit-googlechat-googlechat-pro.html %%DOCSDIR%%/html/webkit-googlechat-googlechat-pro.html
%%DOCSDIR%%/html/webkit-googlechat-main-cpp.html %%DOCSDIR%%/html/webkit-googlechat-main-cpp.html
%%DOCSDIR%%/html/webkit-googlechat.html %%DOCSDIR%%/html/webkit-googlechat.html
%%DOCSDIR%%/html/webkit-imageanalyzer-imageanalyzer-cpp.html
%%DOCSDIR%%/html/webkit-imageanalyzer-imageanalyzer-h.html
%%DOCSDIR%%/html/webkit-imageanalyzer-imageanalyzer-pro.html
%%DOCSDIR%%/html/webkit-imageanalyzer-main-cpp.html
%%DOCSDIR%%/html/webkit-imageanalyzer-mainwindow-cpp.html
%%DOCSDIR%%/html/webkit-imageanalyzer-mainwindow-h.html
%%DOCSDIR%%/html/webkit-imageanalyzer-resources-imageanalyzer-qrc.html
%%DOCSDIR%%/html/webkit-imageanalyzer.html
%%DOCSDIR%%/html/webkit-previewer-main-cpp.html %%DOCSDIR%%/html/webkit-previewer-main-cpp.html
%%DOCSDIR%%/html/webkit-previewer-mainwindow-cpp.html %%DOCSDIR%%/html/webkit-previewer-mainwindow-cpp.html
%%DOCSDIR%%/html/webkit-previewer-mainwindow-h.html %%DOCSDIR%%/html/webkit-previewer-mainwindow-h.html
@ -7323,20 +7173,6 @@
%%DOCSDIR%%/html/widgets-icons-iconsizespinbox-h.html %%DOCSDIR%%/html/widgets-icons-iconsizespinbox-h.html
%%DOCSDIR%%/html/widgets-icons-imagedelegate-cpp.html %%DOCSDIR%%/html/widgets-icons-imagedelegate-cpp.html
%%DOCSDIR%%/html/widgets-icons-imagedelegate-h.html %%DOCSDIR%%/html/widgets-icons-imagedelegate-h.html
%%DOCSDIR%%/html/widgets-icons-images-designer-png.html
%%DOCSDIR%%/html/widgets-icons-images-find-disabled-png.html
%%DOCSDIR%%/html/widgets-icons-images-find-normal-png.html
%%DOCSDIR%%/html/widgets-icons-images-monkey-off-128x128-png.html
%%DOCSDIR%%/html/widgets-icons-images-monkey-off-16x16-png.html
%%DOCSDIR%%/html/widgets-icons-images-monkey-off-32x32-png.html
%%DOCSDIR%%/html/widgets-icons-images-monkey-off-64x64-png.html
%%DOCSDIR%%/html/widgets-icons-images-monkey-on-128x128-png.html
%%DOCSDIR%%/html/widgets-icons-images-monkey-on-16x16-png.html
%%DOCSDIR%%/html/widgets-icons-images-monkey-on-32x32-png.html
%%DOCSDIR%%/html/widgets-icons-images-monkey-on-64x64-png.html
%%DOCSDIR%%/html/widgets-icons-images-qt-extended-16x16-png.html
%%DOCSDIR%%/html/widgets-icons-images-qt-extended-32x32-png.html
%%DOCSDIR%%/html/widgets-icons-images-qt-extended-48x48-png.html
%%DOCSDIR%%/html/widgets-icons-main-cpp.html %%DOCSDIR%%/html/widgets-icons-main-cpp.html
%%DOCSDIR%%/html/widgets-icons-mainwindow-cpp.html %%DOCSDIR%%/html/widgets-icons-mainwindow-cpp.html
%%DOCSDIR%%/html/widgets-icons-mainwindow-h.html %%DOCSDIR%%/html/widgets-icons-mainwindow-h.html
@ -7385,8 +7221,6 @@
%%DOCSDIR%%/html/widgets-spinboxes-window-cpp.html %%DOCSDIR%%/html/widgets-spinboxes-window-cpp.html
%%DOCSDIR%%/html/widgets-spinboxes-window-h.html %%DOCSDIR%%/html/widgets-spinboxes-window-h.html
%%DOCSDIR%%/html/widgets-spinboxes.html %%DOCSDIR%%/html/widgets-spinboxes.html
%%DOCSDIR%%/html/widgets-styles-images-woodbackground-png.html
%%DOCSDIR%%/html/widgets-styles-images-woodbutton-png.html
%%DOCSDIR%%/html/widgets-styles-main-cpp.html %%DOCSDIR%%/html/widgets-styles-main-cpp.html
%%DOCSDIR%%/html/widgets-styles-norwegianwoodstyle-cpp.html %%DOCSDIR%%/html/widgets-styles-norwegianwoodstyle-cpp.html
%%DOCSDIR%%/html/widgets-styles-norwegianwoodstyle-h.html %%DOCSDIR%%/html/widgets-styles-norwegianwoodstyle-h.html
@ -7395,36 +7229,6 @@
%%DOCSDIR%%/html/widgets-styles-widgetgallery-cpp.html %%DOCSDIR%%/html/widgets-styles-widgetgallery-cpp.html
%%DOCSDIR%%/html/widgets-styles-widgetgallery-h.html %%DOCSDIR%%/html/widgets-styles-widgetgallery-h.html
%%DOCSDIR%%/html/widgets-styles.html %%DOCSDIR%%/html/widgets-styles.html
%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-checked-hover-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-checked-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-checked-pressed-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-unchecked-hover-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-unchecked-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-checkbox-unchecked-pressed-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-down-arrow-disabled-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-down-arrow-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-frame-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-pagefold-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-pushbutton-hover-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-pushbutton-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-pushbutton-pressed-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-checked-hover-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-checked-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-checked-pressed-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-unchecked-hover-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-unchecked-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-radiobutton-unchecked-pressed-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-sizegrip-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-spindown-hover-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-spindown-off-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-spindown-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-spindown-pressed-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-spinup-hover-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-spinup-off-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-spinup-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-spinup-pressed-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-up-arrow-disabled-png.html
%%DOCSDIR%%/html/widgets-stylesheet-images-up-arrow-png.html
%%DOCSDIR%%/html/widgets-stylesheet-layouts-default-ui.html %%DOCSDIR%%/html/widgets-stylesheet-layouts-default-ui.html
%%DOCSDIR%%/html/widgets-stylesheet-layouts-pagefold-ui.html %%DOCSDIR%%/html/widgets-stylesheet-layouts-pagefold-ui.html
%%DOCSDIR%%/html/widgets-stylesheet-main-cpp.html %%DOCSDIR%%/html/widgets-stylesheet-main-cpp.html
@ -7455,9 +7259,6 @@
%%DOCSDIR%%/html/widgets-tetrix-tetrixwindow-cpp.html %%DOCSDIR%%/html/widgets-tetrix-tetrixwindow-cpp.html
%%DOCSDIR%%/html/widgets-tetrix-tetrixwindow-h.html %%DOCSDIR%%/html/widgets-tetrix-tetrixwindow-h.html
%%DOCSDIR%%/html/widgets-tetrix.html %%DOCSDIR%%/html/widgets-tetrix.html
%%DOCSDIR%%/html/widgets-tooltips-images-circle-png.html
%%DOCSDIR%%/html/widgets-tooltips-images-square-png.html
%%DOCSDIR%%/html/widgets-tooltips-images-triangle-png.html
%%DOCSDIR%%/html/widgets-tooltips-main-cpp.html %%DOCSDIR%%/html/widgets-tooltips-main-cpp.html
%%DOCSDIR%%/html/widgets-tooltips-shapeitem-cpp.html %%DOCSDIR%%/html/widgets-tooltips-shapeitem-cpp.html
%%DOCSDIR%%/html/widgets-tooltips-shapeitem-h.html %%DOCSDIR%%/html/widgets-tooltips-shapeitem-h.html

1
misc/qt4-l10n/pkg-plist
View file

@ -38,6 +38,7 @@ share/qt4/translations/qt_da.qm
share/qt4/translations/qt_de.qm share/qt4/translations/qt_de.qm
share/qt4/translations/qt_es.qm share/qt4/translations/qt_es.qm
share/qt4/translations/qt_fr.qm share/qt4/translations/qt_fr.qm
share/qt4/translations/qt_gl.qm
share/qt4/translations/qt_he.qm share/qt4/translations/qt_he.qm
share/qt4/translations/qt_help_cs.qm share/qt4/translations/qt_help_cs.qm
share/qt4/translations/qt_help_da.qm share/qt4/translations/qt_help_da.qm

3
misc/qt4-qtdemo/pkg-plist
View file

@ -300,6 +300,7 @@ share/examples/qt4/demos/declarative/snake/content/pics/cookie.png
share/examples/qt4/demos/declarative/snake/content/pics/eyes.svg share/examples/qt4/demos/declarative/snake/content/pics/eyes.svg
share/examples/qt4/demos/declarative/snake/content/pics/head.png share/examples/qt4/demos/declarative/snake/content/pics/head.png
share/examples/qt4/demos/declarative/snake/content/pics/head.svg share/examples/qt4/demos/declarative/snake/content/pics/head.svg
share/examples/qt4/demos/declarative/snake/content/pics/pause.png
share/examples/qt4/demos/declarative/snake/content/pics/redStar.png share/examples/qt4/demos/declarative/snake/content/pics/redStar.png
share/examples/qt4/demos/declarative/snake/content/pics/redStone.png share/examples/qt4/demos/declarative/snake/content/pics/redStone.png
share/examples/qt4/demos/declarative/snake/content/pics/skull.png share/examples/qt4/demos/declarative/snake/content/pics/skull.png
@ -879,6 +880,7 @@ share/examples/qt4/examples/declarative/animation/basics/property-animation.qml
share/examples/qt4/examples/declarative/animation/behaviors/SideRect.qml share/examples/qt4/examples/declarative/animation/behaviors/SideRect.qml
share/examples/qt4/examples/declarative/animation/behaviors/behavior-example.qml share/examples/qt4/examples/declarative/animation/behaviors/behavior-example.qml
share/examples/qt4/examples/declarative/animation/behaviors/behaviors.qmlproject share/examples/qt4/examples/declarative/animation/behaviors/behaviors.qmlproject
share/examples/qt4/examples/declarative/animation/behaviors/wigglytext.qml
share/examples/qt4/examples/declarative/animation/easing/content/QuitButton.qml share/examples/qt4/examples/declarative/animation/easing/content/QuitButton.qml
share/examples/qt4/examples/declarative/animation/easing/content/quit.png share/examples/qt4/examples/declarative/animation/easing/content/quit.png
share/examples/qt4/examples/declarative/animation/easing/easing.qml share/examples/qt4/examples/declarative/animation/easing/easing.qml
@ -1247,7 +1249,6 @@ share/examples/qt4/examples/declarative/positioners/add.png
share/examples/qt4/examples/declarative/positioners/del.png share/examples/qt4/examples/declarative/positioners/del.png
share/examples/qt4/examples/declarative/positioners/positioners.qml share/examples/qt4/examples/declarative/positioners/positioners.qml
share/examples/qt4/examples/declarative/positioners/positioners.qmlproject share/examples/qt4/examples/declarative/positioners/positioners.qmlproject
share/examples/qt4/examples/declarative/positioners/positioners.qmlproject.user
share/examples/qt4/examples/declarative/sqllocalstorage/hello.qml share/examples/qt4/examples/declarative/sqllocalstorage/hello.qml
share/examples/qt4/examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject share/examples/qt4/examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject
share/examples/qt4/examples/declarative/text/fonts/availableFonts.qml share/examples/qt4/examples/declarative/text/fonts/availableFonts.qml

107
net/qt4-network/files/patch-qsslcertificate Normal file
View file

@ -0,0 +1,107 @@
From 04e074e8d7c097295505e63565abdc7ca2b49f7b Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter.hartmann@nokia.com>
Date: Thu, 24 Mar 2011 14:42:22 +0100
Subject: [PATCH] QSslCertificate: report fraudulent certificates as invalid
There are some fraudulent certificates in the wild that are not valid;
this patch introduces a blacklist of serial numbers of those
certificates.
Reviewed-by: Richard J. Moore
Reviewed-by: Markus Goetz
Task-number: QTBUG-18338
---
src/network/ssl/qsslcertificate.cpp | 34 +++++++++++++++++--
src/network/ssl/qsslcertificate_p.h | 1 +
.../more-certificates/blacklisted1.pem | 19 +++++++++++
.../more-certificates/blacklisted2.pem | 19 +++++++++++
.../more-certificates/blacklisted3.pem | 19 +++++++++++
.../more-certificates/blacklisted4.pem | 19 +++++++++++
.../more-certificates/blacklisted5.pem | 19 +++++++++++
.../more-certificates/blacklisted6.pem | 19 +++++++++++
.../more-certificates/blacklisted7.pem | 19 +++++++++++
.../more-certificates/blacklisted8.pem | 19 +++++++++++
.../more-certificates/blacklisted9.pem | 19 +++++++++++
tests/auto/qsslcertificate/tst_qsslcertificate.cpp | 11 ++++++
12 files changed, 213 insertions(+), 4 deletions(-)
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted1.pem
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted2.pem
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted3.pem
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted4.pem
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted5.pem
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted6.pem
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted7.pem
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted8.pem
create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted9.pem
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 618ac79..a5cdf01 100644
--- ./src/network/ssl/qsslcertificate.cpp
+++ ./src/network/ssl/qsslcertificate.cpp
@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const
Returns true if this certificate is valid; otherwise returns
false.
- Note: Currently, this function only checks that the current
+ Note: Currently, this function checks that the current
data-time is within the date-time range during which the
- certificate is considered valid. No other checks are
- currently performed.
+ certificate is considered valid, and checks that the
+ certificate is not in a blacklist of fraudulent certificates.
\sa isNull()
*/
bool QSslCertificate::isValid() const
{
const QDateTime currentTime = QDateTime::currentDateTime();
- return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
+ return currentTime >= d->notValidBefore &&
+ currentTime <= d->notValidAfter &&
+ ! QSslCertificatePrivate::isBlacklisted(*this);
}
/*!
@@ -798,6 +800,30 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
return certificates;
}
+// These certificates are known to be fraudulent and were created during the comodo
+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
+static const char *certificate_blacklist[] = {
+ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
+ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
+ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
+ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
+ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
+ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
+ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
+ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
+ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
+ 0
+};
+
+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
+{
+ for (int a = 0; certificate_blacklist[a] != 0; a++) {
+ if (certificate.serialNumber() == certificate_blacklist[a])
+ return true;
+ }
+ return false;
+}
+
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
{
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
index cdceb0f..1ce33d3 100644
--- ./src/network/ssl/qsslcertificate_p.h
+++ ./src/network/ssl/qsslcertificate_p.h
@@ -96,6 +96,7 @@ public:
static QSslCertificate QSslCertificate_from_X509(X509 *x509);
static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
+ static bool isBlacklisted(const QSslCertificate &certificate);
friend class QSslSocketBackendPrivate;

10
net/qt4-network/files/patch-src__network__ssl__qsslsocket_openssl.cpp
View file

@ -1,10 +0,0 @@
--- ./src/network/ssl/qsslsocket_openssl.cpp.orig 2010-11-06 04:55:18.000000000 +0300
+++ ./src/network/ssl/qsslsocket_openssl.cpp 2010-11-12 00:05:19.726416792 +0300
@@ -777,6 +777,7 @@
systemCerts.append(QSslCertificate::fromPath(QLatin1String("/opt/openssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // HP-UX
systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // (K)ubuntu, OpenSUSE, Mandriva, ...
systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora
+ systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss
systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/lib/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Gentoo, Mandrake
systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/share/ssl/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Centos, Redhat, SuSE
systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/ssl/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Normal OpenSSL Tarball

14
x11-toolkits/qt4-gui/Makefile
View file

@ -65,13 +65,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libcups.a:${PORTSDIR}/print/cups-client
CONFIGURE_ARGS+=-cups -L${LOCALBASE}/lib -I. -I${LOCALBASE}/include CONFIGURE_ARGS+=-cups -L${LOCALBASE}/lib -I. -I${LOCALBASE}/include
.endif .endif
.if ${QT4_OPTIONS:MQGTKSTYLE}
USE_GNOME= gtk20
CONFIGURE_ARGS+=-gtkstyle
.else
CONFIGURE_ARGS+=-no-gtkstyle
.endif
.if ${QT4_OPTIONS:MNAS} .if ${QT4_OPTIONS:MNAS}
LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas
CONFIGURE_ARGS+=-system-nas-sound CONFIGURE_ARGS+=-system-nas-sound
@ -79,6 +72,13 @@ CONFIGURE_ARGS+=-system-nas-sound
CONFIGURE_ARGS+=-no-nas-sound CONFIGURE_ARGS+=-no-nas-sound
.endif .endif
.if ${QT4_OPTIONS:MQGTKSTYLE}
USE_GNOME= gtk20
CONFIGURE_ARGS+=-gtkstyle
.else
CONFIGURE_ARGS+=-no-gtkstyle
.endif
.if defined(PACKAGE_BUILDING) .if defined(PACKAGE_BUILDING)
RUN_DEPENDS+= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ RUN_DEPENDS+= ${FONTSCALE}:${X_FONTS_TTF_PORT} \
${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}