diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-01-11 23:54:15 +1100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 02:54:14 +0100 |
| commit | 330ca76b021d35421a227bd6eaca95653e58bb01 (patch) | |
| tree | 5dadab93ba9ee5383a50f1ef6117f9237c5a43e5 /src/src.pro | |
| parent | bb5cba5dcc3f3453ccbfea2667adc3a12c4ba92b (diff) | |
Revert "Disable activeqt on win32-g++ (it doesn't build)."
the change is bogus; people were actually building it successfully.
This reverts commit 0c70be512bfc40e8a2a09f60a66b7ecb114e748e
Change-Id: I641fac34b78d6c23ead143d34a8ae15bf191cae3
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/src.pro')
| -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 c51683b311..b9e48f418d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -11,7 +11,7 @@ nacl: SRC_SUBDIRS -= src_network src_testlib !wince*:!symbian:!vxworks:!integrity:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support !wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro) -win32:!win32-g++*:SRC_SUBDIRS += src_activeqt +win32: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 |