From 0c70be512bfc40e8a2a09f60a66b7ecb114e748e Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@laptop.com>
Date: Mon, 22 Aug 2011 18:21:36 +0200
Subject: Disable activeqt on win32-g++ (it doesn't build).

Merge-request: 1336
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 configure                              | 4 ++++
 src/src.pro                            | 2 +-
 tools/designer/src/plugins/plugins.pro | 2 +-
 tools/tools.pro                        | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index ec04414..76e32cb 100755
--- a/configure
+++ b/configure
@@ -9013,6 +9013,10 @@ for file in .projects .projects.3; do
             if [ "$CFG_NOPROCESS" = "yes" ] || [ "$XPLATFORM_SYMBIAN" != "yes" ]; then
                 continue
             fi;;
+        *activeqt/*)
+            if [ "$PLATFORM" = "win32-g++" ] || [ "$XPLATFORM" = "win32-g++" ]; then
+                continue
+            fi;;
         *examples/activeqt/*) continue ;;
         */qmake/qmake.pro) continue ;;
         *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;;
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
diff --git a/tools/designer/src/plugins/plugins.pro b/tools/designer/src/plugins/plugins.pro
index bcebb82..64763a9 100644
--- a/tools/designer/src/plugins/plugins.pro
+++ b/tools/designer/src/plugins/plugins.pro
@@ -3,7 +3,7 @@ CONFIG += ordered
 
 REQUIRES = !CONFIG(static,shared|static)
 contains(QT_CONFIG, qt3support): SUBDIRS += widgets
-win32: SUBDIRS += activeqt
+win32:!win32-g++*: SUBDIRS += activeqt
 # contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
 contains(QT_CONFIG, webkit): SUBDIRS += qwebview
 contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
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
-- 
cgit v0.12