summaryrefslogtreecommitdiffstats
path: root/tools/tools.pro
diff options
context:
space:
mode:
authorRay Donnelly <mingw.android@laptop.com>2011-08-22 16:21:36 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-08-22 16:52:23 (GMT)
commit0c70be512bfc40e8a2a09f60a66b7ecb114e748e (patch)
tree86de6b8e7eacc1b123dc135be3a68c046cd1704b /tools/tools.pro
parentdb86c9f57bb6b26d92b0281ac3ca39e1fcbea715 (diff)
downloadQt-0c70be512bfc40e8a2a09f60a66b7ecb114e748e.zip
Qt-0c70be512bfc40e8a2a09f60a66b7ecb114e748e.tar.gz
Qt-0c70be512bfc40e8a2a09f60a66b7ecb114e748e.tar.bz2
Disable activeqt on win32-g++ (it doesn't build).
Merge-request: 1336 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/tools.pro')
-rw-r--r--tools/tools.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro
index 7eecebd..b23df4b 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -21,7 +21,7 @@ TEMPLATE = subdirs
}
}
unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
- win32:!wince*:SUBDIRS += activeqt
+ win32:!wince*:!win32-g++*:SUBDIRS += activeqt
}
contains(QT_CONFIG, declarative) {
SUBDIRS += qml