Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt

59 files changed, 157 insertions, 104 deletions

diff --git a/config.tests/unix/clock-gettime/clock-gettime.pri b/config.tests/unix/clock-gettime/clock-gettime.pri
index 2a6160b..65b49fb 100644
--- a/config.tests/unix/clock-gettime/clock-gettime.pri
+++ b/config.tests/unix/clock-gettime/clock-gettime.pri
@@ -1,2 +1,2 @@
 # clock_gettime() is implemented in librt on these systems
-linux-*|hpux-*|solaris-*:LIBS *= -lrt
+linux-*|hpux-*|solaris-*:LIBS_PRIVATE *= -lrt
diff --git a/demos/macmainwindow/macmainwindow.pro b/demos/macmainwindow/macmainwindow.pro
index f5165a7..ba6ffbb 100644
--- a/demos/macmainwindow/macmainwindow.pro
+++ b/demos/macmainwindow/macmainwindow.pro
@@ -12,7 +12,7 @@ build_all:!build_pass {
     CONFIG += release
 }
 
-LIBS += -framework Cocoa
+LIBS += -framework Cocoa -framework Carbon
 
 # install
 mac {
diff --git a/mkspecs/features/unix/dylib.prf b/mkspecs/features/unix/dylib.prf
index 1268fae..8b13789 100644
--- a/mkspecs/features/unix/dylib.prf
+++ b/mkspecs/features/unix/dylib.prf
@@ -1 +1 @@
-LIBS += $$QMAKE_LIBS_DYNLOAD
+
diff --git a/mkspecs/features/unix/opengl.prf b/mkspecs/features/unix/opengl.prf
index 231d0aa..2fdf324 100644
--- a/mkspecs/features/unix/opengl.prf
+++ b/mkspecs/features/unix/opengl.prf
@@ -1,4 +1,4 @@
 INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
 !isEmpty(QMAKE_LIBDIR_OPENGL):QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL
-target_qt:LIBS += $$QMAKE_LIBS_OPENGL_QT
+target_qt:LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_QT
 else:LIBS += $$QMAKE_LIBS_OPENGL
diff --git a/mkspecs/features/unix/x11lib.prf b/mkspecs/features/unix/x11lib.prf
index 521518a..b661d53 100644
--- a/mkspecs/features/unix/x11lib.prf
+++ b/mkspecs/features/unix/x11lib.prf
@@ -1,2 +1,2 @@
 !isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11
-LIBS += $$QMAKE_LIBS_X11
+LIBS_PRIVATE += $$QMAKE_LIBS_X11
diff --git a/mkspecs/features/unix/x11sm.prf b/mkspecs/features/unix/x11sm.prf
index b455b01..5176147 100644
--- a/mkspecs/features/unix/x11sm.prf
+++ b/mkspecs/features/unix/x11sm.prf
@@ -1,2 +1,2 @@
 !isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11
-LIBS += $$QMAKE_LIBS_X11SM
+LIBS_PRIVATE += $$QMAKE_LIBS_X11SM
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 9580101..bf0e6df 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -967,6 +967,8 @@ MakefileGenerator::writePrlFile(QTextStream &t)
             libs = project->values("QMAKE_INTERNAL_PRL_LIBS");
         else
             libs << "QMAKE_LIBS"; //obvious one
+        if(project->isActiveConfig("staticlib"))
+            libs << "QMAKE_LIBS_PRIVATE";
         t << "QMAKE_PRL_LIBS = ";
         for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
             t << project->values((*it)).join(" ") << " ";
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 36470f2..626b955a5 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -127,6 +127,7 @@ UnixMakefileGenerator::init()
     project->values("QMAKE_ORIG_TARGET") = project->values("TARGET");
     project->values("QMAKE_ORIG_DESTDIR") = project->values("DESTDIR");
     project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
+    project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
     if((!project->isEmpty("QMAKE_LIB_FLAG") && !project->isActiveConfig("staticlib")) ||
        (project->isActiveConfig("qt") &&  project->isActiveConfig("plugin"))) {
         if(configs.indexOf("dll") == -1) configs.append("dll");
@@ -441,7 +442,7 @@ UnixMakefileGenerator::findLibraries()
     QList<QMakeLocalFileName> libdirs, frameworkdirs;
     frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks"));
     frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks"));
-    const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LFLAGS", "QMAKE_LIBS", QString() };
+    const QString lflags[] = { "QMAKE_LIBDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LFLAGS", "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() };
     for(int i = 0; !lflags[i].isNull(); i++) {
         QStringList &l = project->values(lflags[i]);
         for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index b8252b8..07c7d38 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -149,7 +149,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
         t << "LINK          = " << var("QMAKE_LINK") << endl;
         t << "LFLAGS        = " << var("QMAKE_LFLAGS") << endl;
         t << "LIBS          = " << "$(SUBLIBS) " << var("QMAKE_FRAMEWORKDIR_FLAGS") << " "
-          << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << endl;
+          << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl;
     }
 
     t << "AR            = " << var("QMAKE_AR") << endl;
@@ -1424,13 +1424,6 @@ UnixMakefileGenerator::writePkgConfigFile()
     t << "Version: " << project->first("VERSION") << endl;
 
     // libs
-    QStringList libs;
-    if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) {
-        libs = project->values("QMAKE_INTERNAL_PRL_LIBS");
-    } else {
-        libs << "QMAKE_LIBS"; //obvious one
-    }
-    libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
     t << "Libs: ";
     QString pkgConfiglibDir;
     QString pkgConfiglibName;
@@ -1450,6 +1443,15 @@ UnixMakefileGenerator::writePkgConfigFile()
         pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
     }
     t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
+
+    QStringList libs;
+    if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) {
+        libs = project->values("QMAKE_INTERNAL_PRL_LIBS");
+    } else {
+        libs << "QMAKE_LIBS"; //obvious one
+    }
+    libs << "QMAKE_LIBS_PRIVATE";
+    libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
     t << "Libs.private: ";
     for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) {
         t << project->values((*it)).join(" ") << " ";
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 84104fd..fb0f48d 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -82,7 +82,12 @@ QString MingwMakefileGenerator::getLibTarget()
 
 bool MingwMakefileGenerator::findLibraries()
 {
-    QStringList &l = project->values("QMAKE_LIBS");
+    return findLibraries("QMAKE_LIBS") && findLibraries("QMAKE_LIBS_PRIVATE");
+}
+
+bool MingwMakefileGenerator::findLibraries(const QString &where)
+{
+    QStringList &l = project->values(where);
 
     QList<QMakeLocalFileName> dirs;
     {
@@ -258,6 +263,7 @@ void MingwMakefileGenerator::init()
 
     // LIBS defined in Profile comes first for gcc
     project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
+    project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
 
     QString targetfilename = project->values("TARGET").first();
     QStringList &configs = project->values("CONFIG");
@@ -344,7 +350,8 @@ void MingwMakefileGenerator::writeLibsPart(QTextStream &t)
         t << "LIBS        =        ";
         if(!project->values("QMAKE_LIBDIR").isEmpty())
             writeLibDirPart(t);
-        t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << endl;
+        t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << ' '
+          << var("QMAKE_LIBS_PRIVATE").replace(QRegExp("(\\slib|^lib)")," -l") << endl;
     }
 }
 
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index c95beff..8640bbc 100644
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -72,6 +72,7 @@ private:
     QString preCompHeaderOut;
 
     virtual bool findLibraries();
+    bool findLibraries(const QString &where);
     void fixTargetExt();
 
     bool init_flag;
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 7613ef2..3a0ca6f 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -172,6 +172,7 @@ void NmakeMakefileGenerator::init()
     }
 
     project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
+    project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
     processVars();
 
     if (!project->values("RES_FILE").isEmpty()) {
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index e3923c6..3a4329c 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -708,7 +708,7 @@ void Win32MakefileGenerator::writeLibsPart(QTextStream &t)
         if(!project->values("QMAKE_LIBDIR").isEmpty())
             writeLibDirPart(t);
         t << var("QMAKE_LFLAGS") << endl;
-        t << "LIBS          = " << var("QMAKE_LIBS") << endl;
+        t << "LIBS          = " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl;
     }
 }
 
diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h
index e2b6608..7032251 100644
--- a/qmake/generators/win32/winmakefile.h
+++ b/qmake/generators/win32/winmakefile.h
@@ -89,7 +89,7 @@ inline Win32MakefileGenerator::~Win32MakefileGenerator()
 { }
 
 inline bool Win32MakefileGenerator::findLibraries()
-{ return findLibraries("QMAKE_LIBS"); }
+{ return findLibraries("QMAKE_LIBS") && findLibraries("QMAKE_LIBS_PRIVATE"); }
 
 QT_END_NAMESPACE
 
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 68da1d6..2fb5c32 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -2165,6 +2165,7 @@ SOURCES += \
         SOURCES += \
             platform/text/cf/StringCF.cpp \
             platform/text/cf/StringImplCF.cpp
+        LIBS_PRIVATE += -framework Carbon -framework AppKit
     }
 
     win32-* {
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
index 2e247e5..724b18d 100644
--- a/src/corelib/codecs/codecs.pri
+++ b/src/corelib/codecs/codecs.pri
@@ -29,7 +29,7 @@ unix {
                 SOURCES += codecs/qiconvcodec.cpp
 
                 DEFINES += GNU_LIBICONV
-                !mac:LIBS *= -liconv
+                !mac:LIBS_PRIVATE *= -liconv
         } else {
                 # no iconv, so we put all plugins in the library
                 HEADERS += \
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index db51d43..d028772 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -18,7 +18,7 @@ include(codecs/codecs.pri)
 include(statemachine/statemachine.pri)
 include(xml/xml.pri)
 
-mac|darwin:LIBS += -framework ApplicationServices
+mac|darwin:LIBS_PRIVATE += -framework ApplicationServices
 
 mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK
 win32:DEFINES-=QT_NO_CAST_TO_ASCII
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 4108136..35b85c3 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -811,7 +811,7 @@ qint64 QIODevice::read(char *data, qint64 maxSize)
 #endif
 
                 if (readFromDevice < bytesToBuffer)
-                    d->buffer.truncate(readFromDevice < 0 ? 0 : int(readFromDevice));
+                    d->buffer.truncate(int(readFromDevice));
                 if (!d->buffer.isEmpty()) {
                     lastReadChunkSize = d->buffer.read(data + readSoFar, maxSize - readSoFar);
                     readSoFar += lastReadChunkSize;
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 3493784..5c2f384 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -103,7 +103,7 @@ unix {
             HEADERS += \
                 kernel/qeventdispatcher_glib_p.h
             QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
-            LIBS +=$$QT_LIBS_GLIB
+            LIBS_PRIVATE +=$$QT_LIBS_GLIB
         }
             SOURCES += \
                 kernel/qeventdispatcher_unix.cpp
diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index cfc961c..61b19a2 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -488,35 +488,48 @@ const QHash<int,QByteArray> &QAbstractItemModelPrivate::defaultRoleNames()
     return *qDefaultRoleNames();
 }
 
-/*!
-    \internal
-    return true if \a value contains a numerical type
 
-    This function is used by our Q{Tree,Widget,Table}WidgetModel classes to sort.
-    We cannot rely on QVariant::canConvert because this would take strings as double
-    and then not sort strings correctly
-*/
-bool QAbstractItemModelPrivate::canConvertToDouble(const QVariant &value)
+static uint typeOfVariant(const QVariant &value)
 {
+    //return 0 for integer, 1 for floating point and 2 for other
     switch (value.userType()) {
         case QVariant::Bool:
         case QVariant::Int:
         case QVariant::UInt:
         case QVariant::LongLong:
         case QVariant::ULongLong:
-        case QVariant::Double:
         case QVariant::Char:
-        case QMetaType::Float:
         case QMetaType::Short:
         case QMetaType::UShort:
         case QMetaType::UChar:
         case QMetaType::ULong:
         case QMetaType::Long:
-            return true;
+            return 0;
+        case QVariant::Double:
+        case QMetaType::Float:
+            return 1;
         default:
-            return false;
+            return 2;
+    }
+}
+
+/*!
+    \internal
+    return true if \a value contains a numerical type
+
+    This function is used by our Q{Tree,Widget,Table}WidgetModel classes to sort.
+*/
+bool QAbstractItemModelPrivate::variantLessThan(const QVariant &v1, const QVariant &v2)
+{
+    switch(qMax(typeOfVariant(v1), typeOfVariant(v2)))
+    {
+    case 0: //integer type
+        return v1.toLongLong() < v2.toLongLong();
+    case 1: //floating point
+        return v1.toReal() < v2.toReal();
+    default:
+        return v1.toString() < v2.toString();
     }
-    return false;
 }
 
 void QAbstractItemModelPrivate::removePersistentIndexData(QPersistentModelIndexData *data)
diff --git a/src/corelib/kernel/qabstractitemmodel_p.h b/src/corelib/kernel/qabstractitemmodel_p.h
index 76c2d70..e81e627 100644
--- a/src/corelib/kernel/qabstractitemmodel_p.h
+++ b/src/corelib/kernel/qabstractitemmodel_p.h
@@ -89,7 +89,7 @@ public:
     void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last);
     void columnsRemoved(const QModelIndex &parent, int first, int last);
     static QAbstractItemModel *staticEmptyModel();
-    static bool canConvertToDouble(const QVariant &value);
+    static bool variantLessThan(const QVariant &v1, const QVariant &v2);
 
     inline QModelIndex createIndex(int row, int column, void *data = 0) const {
         return q_func()->createIndex(row, column, data);
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 3c430eb..66c4176 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2776,7 +2776,7 @@ bool QVariant::cmp(const QVariant &v) const
     if (d.type != v2.d.type) {
         if (qIsNumericType(d.type) && qIsNumericType(v.d.type)) {
             if (qIsFloatingPoint(d.type) || qIsFloatingPoint(v.d.type))
-                return qFuzzyCompare(toDouble(), v.toDouble());
+                return qFuzzyCompare(toReal(), v.toReal());
             else
                 return toLongLong() == v.toLongLong();
         }
diff --git a/src/corelib/plugin/plugin.pri b/src/corelib/plugin/plugin.pri
index aaecec9..c05ff48 100644
--- a/src/corelib/plugin/plugin.pri
+++ b/src/corelib/plugin/plugin.pri
@@ -22,3 +22,5 @@ win32 {
 unix {
 	SOURCES += plugin/qlibrary_unix.cpp
 }
+
+LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
index dd98499..9f49898 100644
--- a/src/corelib/tools/qshareddata.cpp
+++ b/src/corelib/tools/qshareddata.cpp
@@ -285,6 +285,11 @@ QT_BEGIN_NAMESPACE
   \sa data()
 */
 
+/*! \fn void QSharedDataPointer::swap(QSharedDataPointer &other)
+  Swap this instance's shared data pointer with the shared
+  data pointer in \a other.
+ */
+
 /*! \fn bool QSharedDataPointer::operator==(const QSharedDataPointer<T>& other) const
   Returns true if \a other and \e this have the same \e{d pointer}.
   This function does \e not call detach().
@@ -436,6 +441,11 @@ QT_BEGIN_NAMESPACE
   \sa data()
 */
 
+/*! \fn void QExplicitlySharedDataPointer::swap(QExplicitlySharedDataPointer &other)
+  Swap this instance's explicitly shared data pointer with
+  the explicitly shared data pointer in \a other.
+ */
+
 /*! \fn bool QExplicitlySharedDataPointer::operator==(const QExplicitlySharedDataPointer<T>& other) const
   Returns true if \a other and \e this have the same \e{d pointer}.
 */
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 44fbb62..1a6c1c0 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -91,7 +91,7 @@ contains(QT_CONFIG, zlib) {
 	../3rdparty/zlib/uncompr.c \
 	../3rdparty/zlib/zutil.c
 } else:!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS += -lz
+   unix:LIBS_PRIVATE += -lz
 #  win32:LIBS += libz.lib
 }
 
@@ -109,4 +109,5 @@ SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \
            tools/qharfbuzz.cpp
 HEADERS += tools/qharfbuzz_p.h
 
-!macx-icc:!vxworks:unix:LIBS += -lm
+# Note: libm should be present by default becaue this is C++
+!macx-icc:!vxworks:unix:LIBS_PRIVATE += -lm
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index 39adfe1..dcd8418 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -6,8 +6,8 @@ DEFINES        += QDBUS_MAKEDLL DBUS_API_SUBJECT_TO_CHANGE
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
 
 contains(QT_CONFIG, dbus-linked) {
-    LIBS       += $$QT_LIBS_DBUS
-    DEFINES    += QT_LINKED_LIBDBUS
+    LIBS_PRIVATE += $$QT_LIBS_DBUS
+    DEFINES      += QT_LINKED_LIBDBUS
 }
 
 #INCLUDEPATH += .
@@ -18,9 +18,9 @@ unix {
 }
 
 win32 {
-   LIBS += -lws2_32 -ladvapi32 -lnetapi32 -luser32
-   CONFIG(debug, debug|release):LIBS += -ldbus-1d
-   else:LIBS += -ldbus-1
+   LIBS_PRIVATE += -lws2_32 -ladvapi32 -lnetapi32 -luser32
+   CONFIG(debug, debug|release):LIBS_PRIVATE += -ldbus-1d
+   else:LIBS_PRIVATE += -ldbus-1
 }
 
 include(../qbase.pri)
diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
index 651507f..75a3d91 100644
--- a/src/gui/egl/egl.pri
+++ b/src/gui/egl/egl.pri
@@ -25,4 +25,4 @@ for(p, QMAKE_LIBDIR_EGL) {
 }
 
 !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
+!isEmpty(QMAKE_LIBS_EGL): LIBS_PRIVATE += $$QMAKE_LIBS_EGL
diff --git a/src/gui/embedded/embedded.pri b/src/gui/embedded/embedded.pri
index e8eb959..255a504 100644
--- a/src/gui/embedded/embedded.pri
+++ b/src/gui/embedded/embedded.pri
@@ -189,7 +189,7 @@ embedded {
 	}
 
 	contains( mouse-drivers, tslib ) {
-		LIBS += -lts
+		LIBS_PRIVATE += -lts
 		HEADERS +=embedded/qmousetslib_qws.h
 		SOURCES +=embedded/qmousetslib_qws.cpp
 	}
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 74b8fe2..f454d7c 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1183,6 +1183,9 @@ QGraphicsItem::QGraphicsItem(QGraphicsItemPrivate &dd, QGraphicsItem *parent,
     Destroys the QGraphicsItem and all its children. If this item is currently
     associated with a scene, the item will be removed from the scene before it
     is deleted.
+
+    \note It is more efficient to remove the item from the QGraphicsScene before
+    destroying the item.
 */
 QGraphicsItem::~QGraphicsItem()
 {
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index baf2125..5507d25 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -89,7 +89,7 @@ SOURCES += \
     SOURCES += image/qpnghandler.cpp
 
     contains(QT_CONFIG, system-png) {
-        unix:LIBS  += -lpng
+        unix:LIBS_PRIVATE  += -lpng
         win32:LIBS += libpng.lib
     } else {
         !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp
index 1870a3b..3ab3204 100644
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
@@ -1957,7 +1957,6 @@ bool QListView::event(QEvent *e)
 QListViewPrivate::QListViewPrivate()
     : QAbstractItemViewPrivate(),
       dynamicListView(0),
-      staticListView(0),
       wrap(false),
       space(0),
       flow(QListView::TopToBottom),
diff --git a/src/gui/itemviews/qlistview_p.h b/src/gui/itemviews/qlistview_p.h
index 1131059..6c8d324 100644
--- a/src/gui/itemviews/qlistview_p.h
+++ b/src/gui/itemviews/qlistview_p.h
@@ -351,9 +351,10 @@ public:
 
     QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const;
 
-    // ### FIXME: we only need one at a time
-    QDynamicListViewBase *dynamicListView;
-    QStaticListViewBase *staticListView;
+    union {
+        QDynamicListViewBase *dynamicListView;
+        QStaticListViewBase *staticListView;
+    };
 
     // ### FIXME: see if we can move the members into the dynamic/static classes
 
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp
index 2792bbd..a1f8288 100644
--- a/src/gui/itemviews/qlistwidget.cpp
+++ b/src/gui/itemviews/qlistwidget.cpp
@@ -708,9 +708,7 @@ QVariant QListWidgetItem::data(int role) const
 bool QListWidgetItem::operator<(const QListWidgetItem &other) const
 {
     const QVariant v1 = data(Qt::DisplayRole), v2 = other.data(Qt::DisplayRole);
-    if (QAbstractItemModelPrivate::canConvertToDouble(v1) && QAbstractItemModelPrivate::canConvertToDouble(v2))
-        return v1.toDouble() < v2.toDouble();
-    return v1.toString() < v2.toString();
+    return QAbstractItemModelPrivate::variantLessThan(v1, v2);
 }
 
 #ifndef QT_NO_DATASTREAM
diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp
index f7c7d12..a8ea218 100644
--- a/src/gui/itemviews/qstyleditemdelegate.cpp
+++ b/src/gui/itemviews/qstyleditemdelegate.cpp
@@ -270,7 +270,7 @@ QString QStyledItemDelegate::displayText(const QVariant &value, const QLocale& l
     switch (value.userType()) {
     case QMetaType::Float:
     case QVariant::Double:
-        text = locale.toString(value.toDouble());
+        text = locale.toString(value.toReal());
         break;
     case QVariant::Int:
     case QVariant::LongLong:
diff --git a/src/gui/itemviews/qtablewidget.cpp b/src/gui/itemviews/qtablewidget.cpp
index fea81e5..de8ebde 100644
--- a/src/gui/itemviews/qtablewidget.cpp
+++ b/src/gui/itemviews/qtablewidget.cpp
@@ -1392,9 +1392,7 @@ QVariant QTableWidgetItem::data(int role) const
 bool QTableWidgetItem::operator<(const QTableWidgetItem &other) const
 {
     const QVariant v1 = data(Qt::DisplayRole), v2 = other.data(Qt::DisplayRole);
-    if (QAbstractItemModelPrivate::canConvertToDouble(v1) && QAbstractItemModelPrivate::canConvertToDouble(v2))
-        return v1.toDouble() < v2.toDouble();
-    return v1.toString() < v2.toString();
+    return QAbstractItemModelPrivate::variantLessThan(v1, v2);
 }
 
 #ifndef QT_NO_DATASTREAM
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index 025f83c..f48e393 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -1768,6 +1768,7 @@ QVariant QTreeWidgetItem::data(int column, int role) const
         // special case for check state in tristate
         if (children.count() && (itemFlags & Qt::ItemIsTristate))
             return childrenCheckState(column);
+        // fallthrough intended
    default:
         if (column >= 0 && column < values.size()) {
             const QVector<QWidgetItemData> &column_values = values.at(column);
@@ -1789,9 +1790,7 @@ bool QTreeWidgetItem::operator<(const QTreeWidgetItem &other) const
     int column = view ? view->sortColumn() : 0;
     const QVariant v1 = data(column, Qt::DisplayRole);
     const QVariant v2 = other.data(column, Qt::DisplayRole);
-    if (QAbstractItemModelPrivate::canConvertToDouble(v1) && QAbstractItemModelPrivate::canConvertToDouble(v2))
-        return v1.toDouble() < v2.toDouble();
-    return v1.toString() < v2.toString();
+    return QAbstractItemModelPrivate::variantLessThan(v1, v2);
 }
 
 #ifndef QT_NO_DATASTREAM
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index d9deefe..a94c5a3 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -124,7 +124,7 @@ unix:x11 {
             HEADERS += \
                 kernel/qguieventdispatcher_glib_p.h
             QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
-	    LIBS +=$$QT_LIBS_GLIB
+	    LIBS_PRIVATE +=$$QT_LIBS_GLIB
 	}
             SOURCES += \
 		kernel/qeventdispatcher_x11.cpp
@@ -205,7 +205,7 @@ embedded {
         QMAKE_BUNDLE_DATA += MENU_NIB 
         RESOURCES += mac/macresources.qrc
 
-        LIBS += -framework AppKit
+        LIBS_PRIVATE += -framework AppKit
 }
 
 wince*: {
diff --git a/src/gui/kernel/mac.pri b/src/gui/kernel/mac.pri
index 415fe0a..1538510 100644
--- a/src/gui/kernel/mac.pri
+++ b/src/gui/kernel/mac.pri
@@ -1,4 +1,4 @@
 !x11:!embedded:mac {
-   LIBS += -framework Carbon -lz
+   LIBS_PRIVATE += -framework Carbon -lz
    *-mwerks:INCLUDEPATH += compat
 }
diff --git a/src/gui/kernel/x11.pri b/src/gui/kernel/x11.pri
index ac40f69..82de1b6 100644
--- a/src/gui/kernel/x11.pri
+++ b/src/gui/kernel/x11.pri
@@ -1,4 +1,4 @@
 x11 {
-        contains(QT_CONFIG, nas): LIBS += -laudio -lXt
+        contains(QT_CONFIG, nas): LIBS_PRIVATE += -laudio -lXt
 }
  
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index d226be2..adb73aa 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -352,4 +352,9 @@ embedded {
         SOURCES += painting/qwindowsurface_qws.cpp
 }
 
-
+contains(QT_CONFIG, zlib) {
+   INCLUDEPATH += ../3rdparty/zlib
+} else:!contains(QT_CONFIG, no-zlib) {
+   unix:LIBS_PRIVATE += -lz
+#  win32:LIBS += libz.lib
+}
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index 9b3b289..478a2a8 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -313,7 +313,7 @@ QByteArray QPdf::generatePath(const QPainterPath &path, const QTransform &matrix
 
     Qt::FillRule fillRule = path.fillRule();
 
-    const char *op = 0;
+    const char *op = "";
     switch (flags) {
     case ClipPath:
         op = (fillRule == Qt::WindingFill) ? "W n\n" : "W* n\n";
@@ -1773,6 +1773,9 @@ bool QPdfBaseEnginePrivate::openPrintDevice()
                 (void)execv("/bin/lpr", lprargs);
                 (void)execv("/usr/bin/lp", lpargs);
                 (void)execv("/usr/bin/lpr", lprargs);
+
+                delete []lpargs;
+                delete []lprargs;
             }
             // if we couldn't exec anything, close the fd,
             // wait for a second so the parent process (the
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index 98996e2..eabbb8d 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -712,7 +712,7 @@ QStyleOptionFrameV2 &QStyleOptionFrameV2::operator=(const QStyleOptionFrame &oth
     Constructs a QStyleOptionFrameV3 object.
 */
 QStyleOptionFrameV3::QStyleOptionFrameV3()
-    : QStyleOptionFrameV2(Version), frameShape(QFrame::NoFrame)
+    : QStyleOptionFrameV2(Version), frameShape(QFrame::NoFrame), unused(0)
 {
 }
 
@@ -726,7 +726,7 @@ QStyleOptionFrameV3::QStyleOptionFrameV3()
     \internal
 */
 QStyleOptionFrameV3::QStyleOptionFrameV3(int version)
-    : QStyleOptionFrameV2(version), frameShape(QFrame::NoFrame)
+    : QStyleOptionFrameV2(version), frameShape(QFrame::NoFrame), unused(0)
 {
 }
 
@@ -4845,7 +4845,7 @@ QStyleOptionTabBarBaseV2 &QStyleOptionTabBarBaseV2::operator = (const QStyleOpti
 
 /*! \internal */
 QStyleOptionTabBarBaseV2::QStyleOptionTabBarBaseV2(int version)
-    : QStyleOptionTabBarBase(version)
+    : QStyleOptionTabBarBase(version), documentMode(false)
 {
 }
 
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index d255f80..ce1f91f 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -37,7 +37,7 @@ x11|embedded|!macx-*:styles -= mac
 
 x11{
     QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE
-    LIBS += $$QT_LIBS_QGTKSTYLE
+    LIBS_PRIVATE += $$QT_LIBS_QGTKSTYLE
     styles += gtk
 }
 
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 181ec7e..f11104f 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -793,7 +793,7 @@ static BrushData parseBrushValue(const Value &v, const QPalette &pal)
             if (attr.compare(QLatin1String("spread"), Qt::CaseInsensitive) == 0) {
                 spread = spreads.indexOf(value.variant.toString());
             } else {
-                vars[attr] = value.variant.toString().toDouble();
+                vars[attr] = value.variant.toReal();
             }
         }
         parser.skipSpace();
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index c685b08..6f73445 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -504,7 +504,7 @@ const int NumPseudos = 46;
 
 struct Pseudo
 {
-    Pseudo() : negated(false) { }
+    Pseudo() : type(0), negated(false) { }
     quint64 type;
     QString name;
     QString function;
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index fc33d43..94ed756 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -164,7 +164,7 @@ contains(QT_CONFIG, freetype) {
     embedded:CONFIG += opentype
     # pull in the proper freetype2 include directory
     include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
-    LIBS += -lfreetype
+    LIBS_PRIVATE += -lfreetype
 } else {
     DEFINES *= QT_NO_FREETYPE
 }
diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri
index 3ddb23b..c7fbbb0 100644
--- a/src/multimedia/audio/audio.pri
+++ b/src/multimedia/audio/audio.pri
@@ -31,7 +31,7 @@ mac {
                $$PWD/qaudioinput_mac_p.cpp \
                $$PWD/qaudio_mac.cpp
 
-    LIBS += -framework CoreAudio -framework AudioUnit -framework AudioToolbox
+    LIBS += -framework ApplicationServices -framework CoreAudio -framework AudioUnit -framework AudioToolbox
 
 } else:win32 {
 
@@ -50,7 +50,7 @@ mac {
             SOURCES += $$PWD/qaudiodeviceinfo_alsa_p.cpp \
                    $$PWD/qaudiooutput_alsa_p.cpp \
                    $$PWD/qaudioinput_alsa_p.cpp
-            LIBS += -lasound
+            LIBS_PRIVATE += -lasound
         }
     }
 }
diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index ab7b3a7..edc1b63 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -59,6 +59,6 @@ SOURCES += access/qftp.cpp \
 contains(QT_CONFIG, zlib) {
    INCLUDEPATH += ../3rdparty/zlib
 } else:!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS += -lz
+   unix:LIBS_PRIVATE += -lz
 #  win32:LIBS += libz.lib
 }
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index 8aa6ff4..09d2acf 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -23,7 +23,7 @@ SOURCES += kernel/qauthenticator.cpp \
 unix:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
 win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp
 
-mac:LIBS+= -framework SystemConfiguration
+mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation
 mac:SOURCES += kernel/qnetworkproxy_mac.cpp
 else:win32:SOURCES += kernel/qnetworkproxy_win.cpp
 else:SOURCES += kernel/qnetworkproxy_generic.cpp
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 196e19d..44f4812 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -29,5 +29,5 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
     RESOURCES += network.qrc
 
     # Add optional SSL libs
-    LIBS += $$OPENSSL_LIBS
+    LIBS_PRIVATE += $$OPENSSL_LIBS
 }
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 868484e..4231721 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -73,16 +73,26 @@ x11 {
     }
 
     contains(QT_CONFIG, fontconfig) {
+        contains(QT_CONFIG, system-freetype) {
+            embedded:CONFIG += opentype
+            # pull in the proper freetype2 include directory
             include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
+            LIBS_PRIVATE += -lfreetype
+        } else {
+            ### Note: how does this compile with a non-system freetype?
+	    # This probably doesn't compile
+        }
     } else {
         DEFINES *= QT_NO_FREETYPE
     }
+
+    LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD
 }
 
 mac {
     OBJECTIVE_SOURCES += qgl_mac.mm \
                          qglpixelbuffer_mac.mm
-    LIBS += -framework AppKit
+    LIBS_PRIVATE += -framework AppKit -framework Carbon
 }
 win32:!wince*: {
     SOURCES += qgl_win.cpp \
@@ -131,5 +141,5 @@ wince*: {
     }
 
 } else {
-    QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
+    LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL
 }
diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro
index 240bf13..bf224b4 100644
--- a/src/openvg/openvg.pro
+++ b/src/openvg/openvg.pro
@@ -36,19 +36,19 @@ include(../qbase.pri)
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
 
 !isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG
-!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS += -L$$QMAKE_LIBDIR_OPENVG
-!isEmpty(QMAKE_LIBS_OPENVG): LIBS += $$QMAKE_LIBS_OPENVG
+!isEmpty(QMAKE_LIBDIR_OPENVG): LIBS_PRIVATE += -L$$QMAKE_LIBDIR_OPENVG
+!isEmpty(QMAKE_LIBS_OPENVG): LIBS_PRIVATE += $$QMAKE_LIBS_OPENVG
 
 contains(QT_CONFIG, egl) {
     !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-    !isEmpty(QMAKE_LIBDIR_EGL): LIBS += -L$$QMAKE_LIBDIR_EGL
-    !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
+    !isEmpty(QMAKE_LIBDIR_EGL): LIBS_PRIVATE += -L$$QMAKE_LIBDIR_EGL
+    !isEmpty(QMAKE_LIBS_EGL): LIBS_PRIVATE += $$QMAKE_LIBS_EGL
 }
 
 contains(QT_CONFIG, openvg_on_opengl) {
     !isEmpty(QMAKE_INCDIR_OPENGL): INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-    !isEmpty(QMAKE_LIBDIR_OPENGL): LIBS += -L$$QMAKE_LIBDIR_OPENGL
-    !isEmpty(QMAKE_LIBS_OPENGL): LIBS += $$QMAKE_LIBS_OPENGL
+    !isEmpty(QMAKE_LIBDIR_OPENGL): LIBS_PRIVATE += -L$$QMAKE_LIBDIR_OPENGL
+    !isEmpty(QMAKE_LIBS_OPENGL): LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL
 }
 
 INCLUDEPATH += ../3rdparty/harfbuzz/src
diff --git a/src/plugins/phonon/qt7/qt7.pro b/src/plugins/phonon/qt7/qt7.pro
index 665baee..53407db 100644
--- a/src/plugins/phonon/qt7/qt7.pro
+++ b/src/plugins/phonon/qt7/qt7.pro
@@ -12,7 +12,7 @@ contains(QMAKE_MAC_XARCH, no) {
     LIBS += -Xarch_i386 -framework QuickTime -Xarch_ppc -framework QuickTime
 }
 
-LIBS += -framework AudioUnit \
+LIBS += -framework AppKit -framework AudioUnit \
 	-framework AudioToolbox -framework CoreAudio \
 	-framework QuartzCore -framework QTKit
 
diff --git a/src/qt3support/network/network.pri b/src/qt3support/network/network.pri
index 31ea682..086f56a 100644
--- a/src/qt3support/network/network.pri
+++ b/src/qt3support/network/network.pri
@@ -26,5 +26,5 @@ SOURCES +=      network/q3dns.cpp \
 
 win32:SOURCES +=  network/q3socketdevice_win.cpp
 unix:SOURCES += network/q3socketdevice_unix.cpp
-mac:LIBS += -lresolv
+mac:LIBS_PRIVATE += -lresolv
 
diff --git a/src/qt3support/qt3support.pro b/src/qt3support/qt3support.pro
index 23a4696..a30117c 100644
--- a/src/qt3support/qt3support.pro
+++ b/src/qt3support/qt3support.pro
@@ -25,7 +25,7 @@ unix {
    QMAKE_PKGCONFIG_CFLAGS += -DQT3_SUPPORT
    QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork QtSql
 }
-mac:LIBS += -framework Carbon
+mac:LIBS_PRIVATE += -framework Carbon
 
 QMAKE_LIBS += $$QMAKE_LIBS_COMPAT $$QMAKE_LIBS_NETWORK
 DEFINES -= QT3_SUPPORT_WARNINGS
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index aef0786..9a01983 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -44,5 +44,5 @@ INCLUDEPATH += ../3rdparty/harfbuzz/src
 contains(QT_CONFIG, zlib) {
    INCLUDEPATH += ../3rdparty/zlib
 } else:!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS += -lz
+   unix:LIBS_PRIVATE += -lz
 }
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index 9740c21..5238dfe 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -57,10 +57,9 @@ wince*::LIBS += libcmt.lib \
     commctrl.lib \
     coredll.lib \
     winsock.lib
-mac:LIBS += -framework \
-    IOKit \
-    -framework \
-    Security
+mac:LIBS += -framework IOKit \
+    -framework ApplicationServices \
+    -framework Security
 include(../qbase.pri)
 QMAKE_TARGET_PRODUCT = QTestLib
 QMAKE_TARGET_DESCRIPTION = Qt \
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index a7dfaa9..85a31c7 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -1845,8 +1845,7 @@ QDomNodePrivate* QDomNodePrivate::removeChild(QDomNodePrivate* oldChild)
     oldChild->prev = 0;
 
     // We are no longer interested in the old node
-    if (oldChild)
-        oldChild->ref.deref();
+    oldChild->ref.deref();
 
     return oldChild;
 }
@@ -4355,7 +4354,7 @@ bool QDomAttr::specified() const
 QDomElement QDomAttr::ownerElement() const
 {
     Q_ASSERT(impl->parent());
-    if (!impl || !impl->parent()->isElement())
+    if (!impl->parent()->isElement())
         return QDomElement();
     return QDomElement((QDomElementPrivate*)(impl->parent()));
 }
diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro
index 5d6d436..011dec2 100644
--- a/tools/assistant/lib/lib.pro
+++ b/tools/assistant/lib/lib.pro
@@ -18,14 +18,12 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
     mac:qclucene = $${qclucene}_debug
     win32:qclucene = $${qclucene}d
 }
-linux-lsb-g++:LIBS += --lsb-shared-libs=$$qclucene
-unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
-    QtSql \
-    QtXml
-LIBS += -l$$qclucene
+linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
 unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
     QtSql \
     QtXml
+LIBS_PRIVATE += -l$$qclucene
+
 RESOURCES += helpsystem.qrc
 SOURCES += qhelpenginecore.cpp \
     qhelpengine.cpp \