QtDeclarative: make autotests compile on symbian

Move tests for private classes inside private_tests scope
Add missing libraries
Add QT_NO_CONCURRENT ifdef around a test case
Define Q_DECLARATIVE_PRIVATE_EXPORT as Q_AUTOTEST_EXPORT,
  so the classes are exported for autotests, previously
  they were exported on every OS except symbian.
  (this doesn't affect exports for production builds)

Reviewed-by: Miikka Heikkinen

6 files changed, 41 insertions, 21 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index f0fcfa9..499c155 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -8,74 +8,78 @@ SUBDIRS += \
 SUBDIRS += \
            examples \
            parserstress \
+           qdeclarativecomponent \
+           qdeclarativecontext \
+           qdeclarativeengine \
+           qdeclarativeerror \
+           qdeclarativefolderlistmodel \
+           qdeclarativeinfo \
+           qdeclarativelayoutitem \
+           qdeclarativelistreference \
+           qdeclarativemoduleplugin \
+           qdeclarativeparticles \
+           qdeclarativepixmapcache \
+           qdeclarativeqt \
+           qdeclarativeview \
+           qdeclarativeviewer \
+           qdeclarativexmlhttprequest \
+           qmlvisual \
+           moduleqt47
+
+contains(QT_CONFIG, private_tests) {
+    SUBDIRS += \
            qdeclarativeanchors \
            qdeclarativeanimatedimage \
            qdeclarativeanimations \
            qdeclarativebehaviors \
            qdeclarativebinding \
            qdeclarativeborderimage \
-           qdeclarativecomponent \
            qdeclarativeconnection \
-           qdeclarativecontext \
            qdeclarativedebug \
            qdeclarativedebugclient \
            qdeclarativedebugservice \
            qdeclarativedom \
            qdeclarativeecmascript \
-           qdeclarativeengine \
-           qdeclarativeerror \
-           qdeclarativefolderlistmodel \
-           qdeclarativefontloader \
            qdeclarativeflickable \
            qdeclarativeflipable \
            qdeclarativefocusscope \
+           qdeclarativefontloader \
            qdeclarativegridview \
            qdeclarativeimage \
            qdeclarativeimageprovider \
-           qdeclarativeinfo \
            qdeclarativeinstruction \
            qdeclarativeitem \
            qdeclarativelanguage \
-           qdeclarativelayoutitem \
            qdeclarativelistmodel \
-           qdeclarativelistreference \
            qdeclarativelistview \
            qdeclarativeloader \
-           qdeclarativemoduleplugin \
            qdeclarativemousearea \
-           qdeclarativeparticles \
            qdeclarativepathview \
-           qdeclarativepixmapcache \
            qdeclarativepositioners \
            qdeclarativeproperty \
            qdeclarativepropertymap \
-           qdeclarativeqt \
            qdeclarativerepeater \
            qdeclarativesmoothedanimation \
            qdeclarativespringanimation \
+           qdeclarativestyledtext \
            qdeclarativesqldatabase \
            qdeclarativestates \
-           qdeclarativestyledtext \
            qdeclarativesystempalette \
            qdeclarativetext \
            qdeclarativetextedit \
            qdeclarativetextinput \
            qdeclarativetimer \
            qdeclarativevaluetypes \
-           qdeclarativeview \
-           qdeclarativeviewer \
            qdeclarativevisualdatamodel \
            qdeclarativeworkerscript \
-           qdeclarativexmlhttprequest \
            qdeclarativexmllistmodel \
-           qmlvisual \
-           qpacketprotocol \
-           moduleqt47
+           qpacketprotocol
 
 contains(QT_CONFIG, webkit) {
     SUBDIRS += \
            qdeclarativewebview
 }
+}
 
 # Tests which should run in Pulse
 PULSE_TESTS = $$SUBDIRS
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro
index 97f02af..dafc146 100644
--- a/tests/auto/declarative/examples/examples.pro
+++ b/tests/auto/declarative/examples/examples.pro
@@ -6,6 +6,8 @@ SOURCES += tst_examples.cpp
 
 include(../../../../tools/qml/qml.pri)
 
+include(../symbianlibs.pri)
+
 symbian: {
     importFiles.files = data
     importFiles.path = .
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index 50d0731..1a38e87 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -74,7 +74,9 @@ private slots:
     void massive();
     void cancelcrash();
     void shrinkcache();
+#ifndef QT_NO_CONCURRENT
     void networkCrash();
+#endif
 private:
     QDeclarativeEngine engine;
     QUrl thisfile;
@@ -363,6 +365,7 @@ void createNetworkServer()
    eventLoop.exec();
 }
 
+#ifndef QT_NO_CONCURRENT
 // QT-3957
 void tst_qdeclarativepixmapcache::networkCrash()
 {
@@ -377,6 +380,7 @@ void tst_qdeclarativepixmapcache::networkCrash()
     }
     future.cancel();
 }
+#endif
 
 QTEST_MAIN(tst_qdeclarativepixmapcache)
 
diff --git a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
index a94992b..8d4b410 100644
--- a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
+++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
@@ -6,6 +6,8 @@ include(../../../../tools/qml/qml.pri)
 
 SOURCES += tst_qdeclarativeviewer.cpp
 
+include(../symbianlibs.pri)
+
 symbian: {
     importFiles.files = data
     importFiles.path = .
diff --git a/tests/auto/declarative/qmlvisual/qmlvisual.pro b/tests/auto/declarative/qmlvisual/qmlvisual.pro
index d9fce44..84df15c 100644
--- a/tests/auto/declarative/qmlvisual/qmlvisual.pro
+++ b/tests/auto/declarative/qmlvisual/qmlvisual.pro
@@ -19,7 +19,6 @@ symbian: {
     qdeclarativepathview \
     qdeclarativepositioners \
     qdeclarativesmoothedanimation \
-    qdeclarativespringfollow \
     qdeclarativetext \
     qdeclarativetextedit \
     qdeclarativetextinput \
diff --git a/tests/auto/declarative/symbianlibs.pri b/tests/auto/declarative/symbianlibs.pri
new file mode 100644
index 0000000..4452f67
--- /dev/null
+++ b/tests/auto/declarative/symbianlibs.pri
@@ -0,0 +1,9 @@
+#additional libs required for orientation sensor
+symbian {
+    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
+        LIBS += -lsensrvclient -lsensrvutil
+    }
+    contains(QT_CONFIG, s60): {
+        LIBS += -lavkon -lcone
+    }
+}