Make build and pass tests under qt5

Concatenated a number of fixes.

Fixed QDeclarativeView errors.

This class no longer exists under Qt5, being replaced by QSGView.
Since that class also guarantees OpenGL, there is no need for the
explicit QGLWidget create either.  For now leave the QDeclarativeView3D
class in place, but it is now redundant.

Fixed "Project ERROR: QtQuick3D requires Qt Declarative"

Currently, within qt5, it is possible to guarantee that _make_ runs
over qtquick3d after its dependencies, but not possible to guarantee the
same for _qmake_.  Therefore we must avoid using any values of QT_CONFIG
which are set while running qmake over our dependencies.

Without this, an aggressively parallel build will pseudo-randomly fail
depending on the order in which qmake is run.

Fixed compile for QtDeclarative -> QtQuick1 split.

Classes relating to QtQuick 1 were split into a new module separate from
QtDeclarative.  Update quick3d for this change.

Update sync.profile dependencies to new syntax

%dependencies now has a simpler format of gitmodule => gitref instead of
using qt modules and keywords.

Change-Id: If01d07da1ecf0ced4a9b5a36b2be39105ccffcbb
Reviewed-on: http://codereview.qt.nokia.com/1819
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/sync.profile b/sync.profile
index 9af7190c6..6063bd954 100644
--- a/sync.profile
+++ b/sync.profile
@@ -18,15 +18,16 @@
     "Qt3D" => "$basedir/modules/qt_qt3d.pri",
     "Qt3DQuick" => "$basedir/modules/qt_qt3dquick.pri",
 );
-# Modules and programs, and their dependencies.
+# Module dependencies.
+# Every module that is required to build this module should have one entry.
 # Each of the module version specifiers can take one of the following values:
 #   - A specific Git revision.
-#   - "LATEST_REVISION", to always test against the latest revision.
-#   - "LATEST_RELEASE", to always test against the latest public release.
-#   - "THIS_REPOSITORY", to indicate that the module is in this repository.
+#   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
+#
 %dependencies = (
-    "Qt3D" => {
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtDeclarative" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
+    "qtbase" => "refs/heads/master",
+    "qtscript" => "refs/heads/master",
+    "qtsvg" => "refs/heads/master",
+    "qtxmlpatterns" => "refs/heads/master",
+    "qtdeclarative" => "refs/heads/master",
 );