diff options
author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-10-14 06:18:15 (GMT) |
---|---|---|
committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-10-14 06:18:15 (GMT) |
commit | 01057867c3e5e97fc8b58601e3cee6dfef0df205 (patch) | |
tree | 96125e444f32691c73bc87f0bc938993b7737899 /examples/examples.pro | |
parent | 138b9d7349d5daa1808d8bd891c5ecf817f98c52 (diff) | |
parent | 77563a2e63562e4e010e53dd79a707d9d7ed3f3d (diff) | |
download | Qt-01057867c3e5e97fc8b58601e3cee6dfef0df205.zip Qt-01057867c3e5e97fc8b58601e3cee6dfef0df205.tar.gz Qt-01057867c3e5e97fc8b58601e3cee6dfef0df205.tar.bz2 |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'examples/examples.pro')
-rw-r--r-- | examples/examples.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index cf12dd6..0c4c9cb 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -63,7 +63,7 @@ contains(QT_CONFIG, opengl): SUBDIRS += opengl contains(QT_CONFIG, openvg): SUBDIRS += openvg contains(QT_CONFIG, dbus): SUBDIRS += dbus contains(QT_CONFIG, declarative): SUBDIRS += declarative -win32: SUBDIRS += activeqt +win32:!win32-g++*: SUBDIRS += activeqt contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent |