summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-12-02 17:17:09 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-02 19:00:47 +0100
commit4b97631e9d4462a53940c193fa86ac12deafeb36 (patch)
tree6e9964ae9bdf0550a01a708c92a7a19396a3938a /demos
parentc49288b16f34b6a03d0ca1e1946b65c0bee57be8 (diff)
Compile QtQuick3d.
After qtdeclarative:6c8378eaf1edbbefe6aaa3672b0127816a004fd7 (splitting up declarative). Change-Id: Ic70f0cdffbe2debb7d6a56d72a90ef7215e62a5b Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'demos')
-rw-r--r--demos/quick3d/flickr3d/flickr3d.pro2
-rw-r--r--demos/quick3d/model_viewer/model_viewer.pro2
-rw-r--r--demos/quick3d/qmlres.h2
-rw-r--r--demos/quick3d/robo_bounce/robo_bounce.pro3
-rw-r--r--demos/quick3d/tea_service/tea_service.pro2
5 files changed, 5 insertions, 6 deletions
diff --git a/demos/quick3d/flickr3d/flickr3d.pro b/demos/quick3d/flickr3d/flickr3d.pro
index adfe27e41..24303e947 100644
--- a/demos/quick3d/flickr3d/flickr3d.pro
+++ b/demos/quick3d/flickr3d/flickr3d.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = flickr3d
-QT += declarative
+QT += declarative quick
CONFIG += qt warn_on
SOURCES += main.cpp
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index 57b2590cd..1f80e89e2 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = model_viewer
-QT += declarative widgets
+QT += declarative quick widgets
CONFIG += qt warn_on
SOURCES += main.cpp
diff --git a/demos/quick3d/qmlres.h b/demos/quick3d/qmlres.h
index 3a4f96872..c7023fcc0 100644
--- a/demos/quick3d/qmlres.h
+++ b/demos/quick3d/qmlres.h
@@ -44,7 +44,7 @@
#include <QtCore/qdir.h>
#include <QtGui/QGuiApplication>
-#include <QtDeclarative/QQuickView>
+#include <QtQuick/QQuickView>
#include <QtCore/qdebug.h>
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index d8be78398..1b5fc63a5 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -1,7 +1,6 @@
TEMPLATE = app
TARGET = robo_bounce
-QT += declarative
-CONFIG += qt warn_on
+QT += declarative quick
SOURCES += main.cpp
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index a03cb63ed..cd84bebd7 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = tea_service
-QT += declarative widgets
+QT += declarative quick widgets
CONFIG += qt warn_on
SOURCES += main.cpp