1 files changed, 3 insertions, 22 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 416b2372..32d49fa4 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,7 +1,3 @@
-!include( ../tests.pri ) {
- error( "Couldn't find the tests.pri file!" )
-}
-
 TEMPLATE = subdirs
 SUBDIRS += \
            qchartview \
@@ -28,27 +24,12 @@ SUBDIRS += \
            chartdataset \
            qlegend
 
-contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) {
-    warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.")
-} else {
-    !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative): SUBDIRS += qml
-
-    # Check if QtQuickTest is installed
-    exists($$(QTDIR)/mkspecs/features/qmltestcase.prf){
-        SUBDIRS += qml-qtquicktest
-    } else {
-        warning("QtQuickTest not found; cannot build QML api unit tests")
-    }
-}
-
 !linux-arm*: {
     SUBDIRS += \
            qdatetimeaxis
 }
 
-contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
-    SUBDIRS += quick2
+qtHaveModule(quick) {
+    SUBDIRS += qml \
+               qml-qtquicktest
 }
-
-
-