Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Use a shared QScriptEngine for debugger console command scripts
  Fix QtScript debugger hang/crash issue with updating locals model
  doc:	Fixed some qdoc warnings.
  Always activate popup windows on show
  doc:	Fixed some qdoc warnings.
  Add the QMAKE_FILE_EXT variable to extra compilers generation.
  Cocoa: Tool Windows steal focus from the main window
  qdoc3: Removed a debug output.
  Update QTestLib documentation with chart use case.

1 files changed, 13 insertions, 0 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 7b46341..b0a8011 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1519,6 +1519,19 @@ MakefileGenerator::replaceExtraCompilerVariables(const QString &orig_var, const
                         base = fi.fileName();
                     val += base;
                 }
+            } else if(var == QLatin1String("QMAKE_FILE_EXT")) {
+                filePath = true;
+                for(int i = 0; i < in.size(); ++i) {
+                    QFileInfo fi(fileInfo(Option::fixPathToLocalOS(in.at(i))));
+                    QString ext;
+                    // Ensure complementarity with QMAKE_FILE_BASE
+                    int baseLen = fi.completeBaseName().length();
+                    if(baseLen == 0)
+                        ext = fi.fileName();
+                    else
+                        ext = fi.fileName().remove(0, baseLen);
+                    val += ext;
+                }
             } else if(var == QLatin1String("QMAKE_FILE_PATH") || var == QLatin1String("QMAKE_FILE_IN_PATH")) {
                 filePath = true;
                 for(int i = 0; i < in.size(); ++i)