Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827

7 files changed, 12 insertions, 18 deletions

diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index c7c7d96487..ac602fd6e8 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -951,13 +951,17 @@ void Generator::generateStaticMetacall()
         }
         fprintf(out, "        default: ;\n");
         fprintf(out, "        }\n");
-
-        fprintf(out, "    } else if (_c == QMetaObject::IndexOfMethod) {\n");
+        fprintf(out, "    }");
+        needElse = true;
+    }
+    if (!cdef->signalList.isEmpty()) {
+        Q_ASSERT(needElse); // if there is signal, there was method.
+        fprintf(out, " else if (_c == QMetaObject::IndexOfMethod) {\n");
         fprintf(out, "        int *result = reinterpret_cast<int *>(_a[0]);\n");
         fprintf(out, "        void **func = reinterpret_cast<void **>(_a[1]);\n");
         bool anythingUsed = false;
-        for (int methodindex = 0; methodindex < methodList.size(); ++methodindex) {
-            const FunctionDef &f = methodList.at(methodindex);
+        for (int methodindex = 0; methodindex < cdef->signalList.size(); ++methodindex) {
+            const FunctionDef &f = cdef->signalList.at(methodindex);
             if (f.wasCloned || !f.inPrivateClass.isEmpty() || f.isStatic)
                 continue;
             anythingUsed = true;
diff --git a/src/tools/moc/outputrevision.h b/src/tools/moc/outputrevision.h
index 15661a43aa..2ce5b9b765 100644
--- a/src/tools/moc/outputrevision.h
+++ b/src/tools/moc/outputrevision.h
@@ -43,6 +43,6 @@
 #define OUTPUTREVISION_H
 
 // if the output revision changes, you MUST change it in qobjectdefs.h too
-enum { mocOutputRevision = 63 };          // moc format output revision
+enum { mocOutputRevision = 64 };          // moc format output revision
 
 #endif // OUTPUTREVISION_H
diff --git a/src/tools/moc/util/generate_keywords.pro b/src/tools/moc/util/generate_keywords.pro
index eb04409922..88e5553f54 100644
--- a/src/tools/moc/util/generate_keywords.pro
+++ b/src/tools/moc/util/generate_keywords.pro
@@ -1,12 +1,4 @@
-######################################################################
-# Automatically generated by qmake (1.08a) Mon Feb 23 13:08:28 2004
-######################################################################
-
-TEMPLATE = app
 CONFIG -= moc
 mac:CONFIG -= app_bundle
-INCLUDEPATH += .
 
-# Input
 SOURCES += generate_keywords.cpp
-CONFIG += qt create_prl link_prl
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index bfb3206778..dfe23983b7 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -687,7 +687,7 @@ bool RCCResourceLibrary::output(QIODevice &outDevice, QIODevice &errorDevice)
 
 void RCCResourceLibrary::writeHex(quint8 tmp)
 {
-    const char * const digits = "0123456789abcdef";
+    const char digits[] = "0123456789abcdef";
     writeChar('0');
     writeChar('x');
     if (tmp < 16) {
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index e6b9eefc69..cf10163539 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -32,8 +32,8 @@ for(subname, TOOLS_SUBDIRS) {
     subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
     subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
     subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
-    SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE))
-    !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs)):!separate_debug_info {
+    SUB_TEMPLATE = $$fromfile($$subpro, TEMPLATE)
+    !isEqual(subname, src_tools_bootstrap):if(isEqual(SUB_TEMPLATE, lib) | isEqual(SUB_TEMPLATE, subdirs)):!separate_debug_info {
         #debug
         debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
         debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp
index 16dc12f277..ea1d4f21f3 100644
--- a/src/tools/uic/driver.cpp
+++ b/src/tools/uic/driver.cpp
@@ -43,7 +43,6 @@
 #include "uic.h"
 #include "ui4.h"
 
-#include <QtCore/QRegExp>
 #include <QtCore/QFileInfo>
 #include <QtCore/QDebug>
 
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 2de3352cfc..4ae04149e8 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -58,7 +58,6 @@
 
 #include <QtCore/QXmlStreamReader>
 #include <QtCore/QFileInfo>
-#include <QtCore/QRegExp>
 #include <QtCore/QTextStream>
 #include <QtCore/QDateTime>