Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d

1 files changed, 3 insertions, 12 deletions

diff --git a/tests/auto/qmldevtools/compile/tst_compile.cpp b/tests/auto/qmldevtools/compile/tst_compile.cpp
index ad63922763..6b13d1b4bb 100644
--- a/tests/auto/qmldevtools/compile/tst_compile.cpp
+++ b/tests/auto/qmldevtools/compile/tst_compile.cpp
@@ -38,7 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qtest.h>
 
 #include <private/qqmljsengine_p.h>
 #include <private/qqmljslexer_p.h>
@@ -46,17 +45,9 @@
 #include <private/qqmljsastvisitor_p.h>
 #include <private/qqmljsast_p.h>
 
-class tst_compile : public QObject
+int main()
 {
-    Q_OBJECT
-public:
-    tst_compile() { }
-
-private slots:
     // Nothing - this test just makes sure that the QmlDevTools headers
     // are present, and that we can link against the library.
-};
-
-QTEST_MAIN(tst_compile)
-
-#include "tst_compile.moc"
+    return 0;
+}