8 files changed, 13 insertions, 7 deletions
diff --git a/mkspecs/features/data/unix/findclasslist.pl b/mkspecs/features/data/unix/findclasslist.pl
index fb4357d0d4..b74b8b6a58 100644
--- a/mkspecs/features/data/unix/findclasslist.pl
+++ b/mkspecs/features/data/unix/findclasslist.pl
@@ -55,7 +55,7 @@ while (<STDIN>) {
     my $comment = "    /* $1 */";
     while (my $line = <HDR>) {
         # Match a struct or class declaration, but not a forward declaration
-        $line =~ /^(?:struct|class) (?:Q_.*_EXPORT)? (\w+)(?!;)/ or next;
+        $line =~ /^(?:struct|class|namespace) (?:Q_.*_EXPORT)? (\w+)(?!;)/ or next;
         print $comment if $comment;
         printf "    *%d%s*;\n", length $1, $1;
         $comment = 0;
diff --git a/mkspecs/features/lex.prf b/mkspecs/features/lex.prf
index 16d3a6aa94..7d8325bedb 100644
--- a/mkspecs/features/lex.prf
+++ b/mkspecs/features/lex.prf
@@ -5,6 +5,7 @@
 {
     lex.name = Lex ${QMAKE_FILE_IN}
     lex.input = LEXSOURCES
+    lex.dependency_type = TYPE_C
     lex_included {
         lex.CONFIG += no_link
     } else {
diff --git a/mkspecs/features/mac/objective_c.prf b/mkspecs/features/mac/objective_c.prf
index b3b1d4be99..ed1ad8ad38 100644
--- a/mkspecs/features/mac/objective_c.prf
+++ b/mkspecs/features/mac/objective_c.prf
@@ -1,6 +1,7 @@
 
 # Objective-C/C++ sources go in SOURCES, like all other sources
 SOURCES += $$OBJECTIVE_SOURCES
+unset(OBJECTIVE_SOURCES)
 
 # Strip C/C++ flags from QMAKE_OBJECTIVE_CFLAGS just in case
 QMAKE_OBJECTIVE_CFLAGS -= $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS
@@ -8,3 +9,4 @@ QMAKE_OBJECTIVE_CFLAGS -= $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS
 # Add Objective-C/C++ flags to C/C++ flags, the compiler can handle it
 QMAKE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS
 QMAKE_CXXFLAGS += $$QMAKE_OBJECTIVE_CFLAGS
+unset(QMAKE_OBJECTIVE_CFLAGS)
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 8ddfc38c63..9d3c3353cc 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -56,7 +56,7 @@ moc_source.CONFIG = no_link moc_verify
 moc_source.dependency_type = TYPE_C
 moc_source.commands = ${QMAKE_FUNC_mocCmdBase} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
 moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC}
-moc_source.input = SOURCES OBJECTIVE_SOURCES
+moc_source.input = SOURCES
 moc_source.name = MOC ${QMAKE_FILE_IN}
 moc_source.depends += $$WIN_INCLUDETEMP
 silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index bb52f23378..c0f17f9808 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -290,7 +290,8 @@ contains(TEMPLATE, .*app) {
     autoplugs =
     for (qtmod, qt_module_deps) {
         for (ptype, QT.$${qtmod}.plugin_types) {
-            isEmpty(QTPLUGIN.$$ptype) {
+            nptype = $$replace(ptype, [-/], _)
+            isEmpty(QTPLUGIN.$$nptype) {
                 for (plug, QT_PLUGINS) {
                     equals(QT_PLUGIN.$${plug}.TYPE, $$ptype) {
                         for (dep, QT_PLUGIN.$${plug}.EXTENDS) {
@@ -303,7 +304,7 @@ contains(TEMPLATE, .*app) {
                     }
                 }
             } else {
-                plug = $$eval(QTPLUGIN.$$ptype)
+                plug = $$eval(QTPLUGIN.$$nptype)
                 !equals(plug, -): \
                     autoplugs += $$plug
             }
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
index 4dd9e25f9f..95b4b586a8 100644
--- a/mkspecs/features/qt_module_pris.prf
+++ b/mkspecs/features/qt_module_pris.prf
@@ -70,7 +70,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
     else: \
         module_config =
     !isEmpty(MODULE_PLUGIN_TYPES): \
-        module_plugtypes = "QT.$${MODULE_ID}.plugin_types = $$replace(MODULE_PLUGIN_TYPES, /.*$, )"
+        module_plugtypes = "QT.$${MODULE_ID}.plugin_types = $$replace(MODULE_PLUGIN_TYPES, /[^.]+\\.[^.]+$, )"
     else: \
         module_plugtypes =
     !isEmpty(MODULE_MASTER_HEADER): \
diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf
index 272cc8ef79..ebb37bdfc7 100644
--- a/mkspecs/features/unix/separate_debug_info.prf
+++ b/mkspecs/features/unix/separate_debug_info.prf
@@ -87,8 +87,9 @@ have_target:!static:if(darwin|!isEmpty(QMAKE_OBJCOPY)) {
         QMAKE_POST_LINK = $$mkdir_debug_info && $$copy_debug_info && $$strip_debug_info $$QMAKE_POST_LINK
     } else {
         link_debug_info = $$QMAKE_OBJCOPY --add-gnu-debuglink=$$shell_target_debug_info $$shell_target
-        chmod_debug_info = chmod -x $$shell_target_debug_info
-        QMAKE_POST_LINK = $$copy_debug_info && $$strip_debug_info && $$link_debug_info && $$chmod_debug_info $$QMAKE_POST_LINK
+        !contains(QMAKE_HOST.os, Windows): \
+            QMAKE_POST_LINK = && chmod -x $$shell_target_debug_info $$QMAKE_POST_LINK
+        QMAKE_POST_LINK = $$copy_debug_info && $$strip_debug_info && $$link_debug_info $$QMAKE_POST_LINK
     }
     silent:QMAKE_POST_LINK = @echo creating $@.$$debug_info_suffix && $$QMAKE_POST_LINK
 
diff --git a/mkspecs/features/yacc.prf b/mkspecs/features/yacc.prf
index 915fbf6850..618f0668c2 100644
--- a/mkspecs/features/yacc.prf
+++ b/mkspecs/features/yacc.prf
@@ -35,6 +35,7 @@
     yacc_impl.name = source for ${QMAKE_FILE_IN}
     yacc_impl.input = YACCSOURCES
     yacc_impl.variable_out = GENERATED_SOURCES
+    yacc_impl.dependency_type = TYPE_C
     yacc_impl.commands = $$escape_expand(\\n)        # We don't want any commands where, but if command is empty no rules are created
     yacc_impl.depends += $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_MOD_YACC}$${first(QMAKE_EXT_H)}    # Make sure we depend on the step above
     yacc_impl.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_MOD_YACC}$${first(QMAKE_EXT_CPP)}   # Faked output from this step, output really created in step above