Merge remote branch 'mainline/4.8'

Conflicts:
	tools/qdoc3/cppcodemarker.cpp
	tools/qdoc3/node.cpp

4 files changed, 10 insertions, 61 deletions

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/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index 0fc30bc..75d6094 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -483,10 +483,10 @@ QList<Section> CppCodeMarker::sections(const InnerNode *inner,
                                         "",
                                         "public function",
                                         "public functions");
-            FastSection publicSignals(classe, "Signals", "", "signal", "signal");
-            FastSection publicSlots(classe, "Public Slots", "", "public slot", "public slots");
-            FastSection publicTypes(classe, "Public Types", "", "public type", "public types");
-            FastSection publicVariables(classe,
+	    FastSection publicSignals(classe, "Signals", "", "signal", "signals");
+	    FastSection publicSlots(classe, "Public Slots", "", "public slot", "public slots");
+	    FastSection publicTypes(classe, "Public Types", "", "public type", "public types");
+	    FastSection publicVariables(classe,
                                         "Public Variables",
                                         "",
                                         "public variable",
@@ -878,28 +878,6 @@ static const char * const keywordTable[] = {
     "signals", "slots", "emit", 0
 };
 
-#if 0
-static QString untabified(const QString &in)
-{
-    QString res;
-    int col = 0;
-    int i = 0;
-
-    for (; i < (int) in.length(); i++) {
-	if (in[i] == QChar('\t')) {
-	    res += QString("        " + (col & 0x7));
-	    col = (col + 8) & ~0x7;
-	} else {
-	    res += in[i];
-	    if (in[i] == QChar('\n'))
-		col = 0;
-	}
-    }
-
-    return res;
-}
-#endif
-
 /*
     @char
     @class
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index b1d94e2..41de23e 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -39,6 +39,10 @@
 **
 ****************************************************************************/
 
+/*
+  node.cpp
+*/
+
 #include "node.h"
 #include "tree.h"
 #include "codemarker.h"
@@ -1724,39 +1728,6 @@ bool QmlPropertyNode::fromTrool(Trool troolean, bool defaultValue)
     }
 }
 
-#if 0
-static QString valueType(const QString &n)
-{
-    if (n == "QPoint")
-        return "QDeclarativePointValueType";
-    if (n == "QPointF")
-        return "QDeclarativePointFValueType";
-    if (n == "QSize")
-        return "QDeclarativeSizeValueType";
-    if (n == "QSizeF")
-        return "QDeclarativeSizeFValueType";
-    if (n == "QRect")
-        return "QDeclarativeRectValueType";
-    if (n == "QRectF")
-        return "QDeclarativeRectFValueType";
-    if (n == "QVector2D")
-        return "QDeclarativeVector2DValueType";
-    if (n == "QVector3D")
-        return "QDeclarativeVector3DValueType";
-    if (n == "QVector4D")
-        return "QDeclarativeVector4DValueType";
-    if (n == "QQuaternion")
-        return "QDeclarativeQuaternionValueType";
-    if (n == "QMatrix4x4")
-        return "QDeclarativeMatrix4x4ValueType";
-    if (n == "QEasingCurve")
-        return "QDeclarativeEasingValueType";
-    if (n == "QFont")
-        return "QDeclarativeFontValueType";
-    return QString();
-}
-#endif
-
 /*!
   Returns true if a QML property or attached property is
   read-only. The algorithm for figuring this out is long
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