Fixed building issues.

Qt5 checks in all qmlres.h files.
Removed duplicate += qtquick3d's in pro files.
Updated manual test to use DeclarativeView3D's.

Updated the qmlres.h files for demos/tutorials/tests to point to the
resources/examples directory where all the qml files are stored,
rather then resources/demos, resouces/tutorials, resources/tests, which
don't exist.

Change-Id: I5e8c99e22cf1bf6aace8fd595e42c8beb736d823
Reviewed-on: http://codereview.qt.nokia.com/1338
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>

17 files changed, 25 insertions, 52 deletions

diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro
index 08cdedd7c..7e4cdf02a 100644
--- a/tests/manual/animations/animations.pro
+++ b/tests/manual/animations/animations.pro
@@ -3,8 +3,6 @@ TARGET = tst_animations
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
-!package: CONFIG += qt3dquick
-
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/animations/main.cpp b/tests/manual/animations/main.cpp
index 5af76d286..889bb2192 100644
--- a/tests/manual/animations/main.cpp
+++ b/tests/manual/animations/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
 
@@ -49,7 +48,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     QString qml = q_get_qmldir(QLatin1String("qml/tst_animations.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro
index 1242dc90b..85a9fcbe9 100644
--- a/tests/manual/displaymodel/displaymodel.pro
+++ b/tests/manual/displaymodel/displaymodel.pro
@@ -3,8 +3,6 @@ TARGET = tst_displaymodel
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
-!package: CONFIG += qt3dquick
-
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/displaymodel/main.cpp b/tests/manual/displaymodel/main.cpp
index e881e76bd..0faa78a85 100644
--- a/tests/manual/displaymodel/main.cpp
+++ b/tests/manual/displaymodel/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
 
@@ -49,9 +48,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    qDebug() << "tst_displaymodel.qml";
-
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     QString qml = q_get_qmldir(QLatin1String("qml/tst_displaymodel.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
diff --git a/tests/manual/model3ds/main.cpp b/tests/manual/model3ds/main.cpp
index 28607791d..a7810d132 100644
--- a/tests/manual/model3ds/main.cpp
+++ b/tests/manual/model3ds/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
 
@@ -49,9 +48,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    qDebug() << "tst_model3ds.qml";
-
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     QString qml = q_get_qmldir(QLatin1String("qml/tst_model3ds.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
diff --git a/tests/manual/navigation1/main.cpp b/tests/manual/navigation1/main.cpp
index 88ed4a495..f63fad761 100644
--- a/tests/manual/navigation1/main.cpp
+++ b/tests/manual/navigation1/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
 
@@ -49,9 +48,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    qDebug() << "tst_navigation1.qml";
-
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     QString qml = q_get_qmldir(QLatin1String("qml/tst_navigation1.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
diff --git a/tests/manual/rotation/main.cpp b/tests/manual/rotation/main.cpp
index a63698811..86db8c721 100644
--- a/tests/manual/rotation/main.cpp
+++ b/tests/manual/rotation/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
 
@@ -49,7 +48,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     QString qml = q_get_qmldir(QLatin1String("qml/tst_rotation.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro
index 922fa2ac3..edb7deec4 100644
--- a/tests/manual/rotation/rotation.pro
+++ b/tests/manual/rotation/rotation.pro
@@ -3,8 +3,6 @@ TARGET = tst_rotation
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
-!package: CONFIG += qt3dquick
-
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/scaling/main.cpp b/tests/manual/scaling/main.cpp
index 0dd4909bd..6ccc45915 100644
--- a/tests/manual/scaling/main.cpp
+++ b/tests/manual/scaling/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
 
@@ -49,7 +48,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     QString qml = q_get_qmldir(QLatin1String("qml/tst_scaling.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
index 6e619c058..a98d3a2cb 100644
--- a/tests/manual/scaling/scaling.pro
+++ b/tests/manual/scaling/scaling.pro
@@ -3,8 +3,6 @@ TARGET = tst_scaling
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
-!package: CONFIG += qt3dquick
-
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/submesh/main.cpp b/tests/manual/submesh/main.cpp
index bea68e85d..9f6256985 100644
--- a/tests/manual/submesh/main.cpp
+++ b/tests/manual/submesh/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
 
@@ -49,9 +48,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    qDebug() << "tst_submesh.qml";
-
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     QString qml = q_get_qmldir(QLatin1String("qml/tst_submesh.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
index 4cb5afe0a..d9f4a5f4b 100644
--- a/tests/manual/submesh/submesh.pro
+++ b/tests/manual/submesh/submesh.pro
@@ -3,8 +3,6 @@ TARGET = tst_submesh
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
-!package: CONFIG += qt3dquick
-
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/transformations/main.cpp b/tests/manual/transformations/main.cpp
index 2016c1ee1..fee0155cd 100644
--- a/tests/manual/transformations/main.cpp
+++ b/tests/manual/transformations/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
 
@@ -49,7 +48,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     QString qml = q_get_qmldir(QLatin1String("qml/tst_transformations.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro
index 1ac74c08c..7a221d545 100644
--- a/tests/manual/transformations/transformations.pro
+++ b/tests/manual/transformations/transformations.pro
@@ -3,8 +3,6 @@ TARGET = tst_transformations
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
-!package: CONFIG += qt3dquick
-
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/manual/translation/main.cpp b/tests/manual/translation/main.cpp
index fee52cd1b..31da11038 100644
--- a/tests/manual/translation/main.cpp
+++ b/tests/manual/translation/main.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QApplication>
-#include <QtDeclarative/qdeclarativeview.h>
-#include <QtCore/qdir.h>
+#include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
 
@@ -49,7 +48,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    QDeclarativeView view;
+    QDeclarativeView3D view;
     QString qml = q_get_qmldir(QLatin1String("qml/tst_translation.qml"));
     view.setSource(QUrl::fromLocalFile(qml));
 
diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro
index 0b07f3aa6..f6adcab73 100644
--- a/tests/manual/translation/translation.pro
+++ b/tests/manual/translation/translation.pro
@@ -3,8 +3,6 @@ TARGET = tst_translation
 CONFIG += qt warn_on
 !package: CONFIG += qt3dquick
 
-!package: CONFIG += qt3dquick
-
 SOURCES += main.cpp
 
 include(../../../qt3dquick_pkg_dep.pri)
diff --git a/tests/shared/qmlres.h b/tests/shared/qmlres.h
index 00656c5a0..f8d7399ef 100644
--- a/tests/shared/qmlres.h
+++ b/tests/shared/qmlres.h
@@ -59,7 +59,11 @@ static QString q_get_qmldir(const QString &name)
 {
     QString qml = name;
     // try for a Linux package install first
-    QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/tests"));
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    QDir pkgdir(QLatin1String("/usr/share/qt5/quick3d/examples"));
+#else
+    QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/examples"));
+#endif
     QString app = QCoreApplication::applicationFilePath();
     app = app.section(QDir::separator(), -1);
     if (pkgdir.cd(app) && pkgdir.exists())
@@ -98,13 +102,13 @@ static QString q_get_qmldir(const QString &name)
                 //Grab just the app name itself.
                 app = app.section(QDir::separator(), -1);
 
-                if (dir.cd(QLatin1String("tests")) && dir.cd(app) && dir.exists())
+                if (dir.cd(QLatin1String("examples")) && dir.cd(app) && dir.exists())
                 {                    
                     qml = dir.filePath(qml);                    
                 }
                 else
                 {
-                    QString msg = QLatin1String("tests");
+                    QString msg = QLatin1String("examples");
                     msg += QDir::separator();
                     msg += app;
                     qWarning("Expected %s directry with qml resources!", qPrintable(msg));