5 files changed, 11 insertions, 36 deletions
diff --git a/src/widgets/dialogs/qfileinfogatherer.cpp b/src/widgets/dialogs/qfileinfogatherer.cpp
index b08cc798e5..41b0b30eeb 100644
--- a/src/widgets/dialogs/qfileinfogatherer.cpp
+++ b/src/widgets/dialogs/qfileinfogatherer.cpp
@@ -146,6 +146,15 @@ void QFileInfoGatherer::fetchExtendedInformation(const QString &path, const QStr
     this->path.push(path);
     this->files.push(files);
     condition.wakeAll();
+
+#ifndef QT_NO_FILESYSTEMWATCHER
+    if (files.isEmpty()
+        && !path.isEmpty()
+        && !path.startsWith(QLatin1String("//")) /*don't watch UNC path*/) {
+        if (!watcher->directories().contains(path))
+            watcher->addPath(path);
+    }
+#endif
 }
 
 /*!
@@ -269,16 +278,6 @@ static QString translateDriveName(const QFileInfo &drive)
  */
 void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &files)
 {
-#ifndef QT_NO_FILESYSTEMWATCHER
-    if (files.isEmpty()
-        && !path.isEmpty()
-        && !path.startsWith(QLatin1String("//")) /*don't watch UNC path*/) {
-        QMutexLocker locker(&mutex);
-        if (!watcher->directories().contains(path))
-            watcher->addPath(path);
-    }
-#endif
-
     // List drives
     if (path.isEmpty()) {
 #ifdef QT_BUILD_INTERNAL
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 9913b225fc..2b90971398 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -94,9 +94,6 @@
 #include "qgesture.h"
 #include "private/qgesturemanager_p.h"
 #include <qpa/qplatformfontdatabase.h>
-#ifndef QT_NO_LIBRARY
-#include "qlibrary.h"
-#endif
 
 #ifdef Q_OS_WIN
 #include <QtCore/qt_windows.h> // for qt_win_display_dc()
@@ -428,7 +425,6 @@ int qt_antialiasing_threshold = -1;
 QSize QApplicationPrivate::app_strut = QSize(0,0); // no default application strut
 int QApplicationPrivate::enabledAnimations = QPlatformTheme::GeneralUiEffect;
 bool QApplicationPrivate::widgetCount = false;
-bool QApplicationPrivate::load_testability = false;
 #ifdef QT_KEYPAD_NAVIGATION
 Qt::NavigationMode QApplicationPrivate::navigationMode = Qt::NavigationModeKeypadTabOrder;
 QWidget *QApplicationPrivate::oldEditFocus = 0;
@@ -503,8 +499,6 @@ void QApplicationPrivate::process_cmdline()
 #endif
         } else if (qstrcmp(arg, "-widgetcount") == 0) {
             widgetCount = true;
-        } else if (qstrcmp(arg, "-testability") == 0) {
-            load_testability = true;
         } else {
             argv[j++] = argv[i];
         }
@@ -595,28 +589,11 @@ void QApplicationPrivate::construct()
     extern void qt_gui_eval_init(QCoreApplicationPrivate::Type);
     qt_gui_eval_init(application_type);
 #endif
-
 #ifndef QT_NO_ACCESSIBILITY
     // factory for accessible interfaces for widgets shipped with Qt
     QAccessible::installFactory(&qAccessibleFactory);
 #endif
 
-#ifndef QT_NO_LIBRARY
-    if(load_testability) {
-        QLibrary testLib(QLatin1String("qttestability"));
-        if (testLib.load()) {
-            typedef void (*TasInitialize)(void);
-            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
-            if (initFunction) {
-                initFunction();
-            } else {
-                qCritical("Library qttestability resolve failed!");
-            }
-        } else {
-            qCritical("Library qttestability load failed!");
-        }
-    }
-#endif
 }
 
 void qt_init(QApplicationPrivate *priv, int type)
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index d5efb62dda..29142470a7 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -214,7 +214,6 @@ public:
 
     static int enabledAnimations; // Combination of QPlatformTheme::UiEffect
     static bool widgetCount; // Coupled with -widgetcount switch
-    static bool load_testability; // Coupled with -testability switch
 
     static void setSystemPalette(const QPalette &pal);
     static void setPalette_helper(const QPalette &palette, const char* className, bool clearWidgetPaletteHash);
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index 2b43fd7f6d..16fb41e1fc 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -273,7 +273,7 @@ void QTipLabel::hideTipImmediately()
 
 void QTipLabel::setTipRect(QWidget *w, const QRect &r)
 {
-    if (!rect.isNull() && !w)
+    if (!r.isNull() && !w)
         qWarning("QToolTip::setTipRect: Cannot pass null widget if rect is set");
     else{
         widget = w;
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index e830ac3c76..1b48441993 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -309,7 +309,7 @@ void QAbstractScrollAreaPrivate::init()
     q->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
     q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     layoutChildren();
-#ifndef Q_WS_MAC
+#ifndef Q_OS_OSX
 #  ifndef QT_NO_GESTURES
     viewport->grabGesture(Qt::PanGesture);
 #  endif