diff --git a/src/declarative/qml/v8/qv8gccallback_p.h b/src/declarative/qml/v8/qv8gccallback_p.h
index 91574cb6a5..f18b20b498 100644
--- a/src/declarative/qml/v8/qv8gccallback_p.h
+++ b/src/declarative/qml/v8/qv8gccallback_p.h
@@ -69,7 +69,7 @@ public:
     static void registerGcPrologueCallback();
     static void releaseWorkerThreadGcPrologueCallbackData();
 
-    class Referencer {
+    class Q_AUTOTEST_EXPORT Referencer {
     public:
         ~Referencer();
         void addRelationship(QObject *object, v8::Persistent<v8::Value> handle);
@@ -81,7 +81,7 @@ public:
         friend class QV8GCCallback::ThreadData;
     };
 
-    class Node {
+    class Q_AUTOTEST_EXPORT Node {
     public:
         typedef void (*PrologueCallback)(Referencer *r, Node *node);
         Node(PrologueCallback callback);
diff --git a/tests/auto/declarative/qquickgridview/qquickgridview.pro b/tests/auto/declarative/qquickgridview/qquickgridview.pro
index 6c097d6629..c88b63a68e 100644
--- a/tests/auto/declarative/qquickgridview/qquickgridview.pro
+++ b/tests/auto/declarative/qquickgridview/qquickgridview.pro
@@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += parallel_test
 CONFIG += insignificant_test #QTBUG-22807
-QT += core-private gui-private v8-private declarative-private opengl-private testlib
+QT += core-private gui-private v8-private declarative-private opengl-private testlib widgets
diff --git a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp
index 4b041dd415..b19842c795 100644
--- a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp
@@ -45,6 +45,7 @@
 #include <QFile>
 #include <QtDeclarative/qquickview.h>
 #include <QtGui/qguiapplication.h>
+#include <QtGui/qstylehints.h>
 #include <QInputPanel>
 #include <private/qquicktextinput_p.h>
 #include <private/qquicktextinput_p_p.h>
@@ -2659,7 +2660,7 @@ void tst_qquicktextinput::tripleClickSelectsAll()
     // And now we press the third click too late, so no triple click event is triggered.
     QTest::mouseDClick(&view, Qt::LeftButton, 0, pointInside);
     QGuiApplication::processEvents();
-    QTest::qWait(QApplication::doubleClickInterval() + 1);
+    QTest::qWait(qApp->styleHints()->mouseDoubleClickInterval() + 1);
     QTest::mouseClick(&view, Qt::LeftButton, 0, pointInside);
     QGuiApplication::processEvents();
     QVERIFY(input->selectedText().isEmpty());