Changeset 846 for trunk/demos/qtdemo/qtdemo.pro

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/qtdemo/qtdemo.pro (modified) (3 diffs)

trunk/demos/qtdemo/qtdemo.pro

@@ -1 @@
-CONFIG += assistant help x11inc
+CONFIG += help x11inc
 TARGET = qtdemo
 DEMO_DESTDIR = $$QT_BUILD_TREE
@@ -12 +12 @@
     DEFINES += QT_OPENGL_SUPPORT
     QT += opengl
+}
+
+contains(QT_CONFIG, declarative) {
+    QT += declarative
 }
 
@@ -76 +80 @@
 sources.path = $$[QT_INSTALL_DEMOS]/qtdemo
 
+OTHER_FILES += \
+    qmlShell.qml