diff options
author | Ray Donnelly <mingw.android@laptop.com> | 2011-08-22 16:21:36 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-08-22 16:52:23 (GMT) |
commit | 0c70be512bfc40e8a2a09f60a66b7ecb114e748e (patch) | |
tree | 86de6b8e7eacc1b123dc135be3a68c046cd1704b /src | |
parent | db86c9f57bb6b26d92b0281ac3ca39e1fcbea715 (diff) | |
download | Qt-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 'src')
-rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 9e29b89..9314fbd 100644 --- a/src/src.pro +++ b/src/src.pro @@ -11,7 +11,7 @@ nacl: SRC_SUBDIRS -= src_network src_testlib !wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support !wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro) -win32:SRC_SUBDIRS += src_activeqt +win32:!win32-g++*:SRC_SUBDIRS += src_activeqt contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg |