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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits)
  Revert Merge Request 551. This introduces regressions to Qt.
  Fixed scroll area size calculation on Mac.
  Fix a race where QThread::exit() is "lost" when called after start()
  make a partial build of linguist in no-gui config
  make the code less of a trap
  fix build from top level
  Partially revert MR 543 changes to Linguist.
  Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
  Autotest: add some debugging, just in case there's something wrong
  Autotest: fix the fix for the rounding error.
  Fix compile error with QT_NO_LIBRARY in QtMultimedia
  the _setmode() prototype is different on win ce
  qdoc: Changed qdoc to output the new doc format.
  Doc: update 'developing on mac'
  fcntl.h doesn't seem to exist, either - contrary to an example on msdn
  Autotest: fix paths on the test server after update.
  Force the repaint during a window resize.
  fix compile on wince
  remove CONFIG += ordered again
  Assistant: Check namespace and virtual folder syntax of help projects.
  ...

1 files changed, 55 insertions, 0 deletions

diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 3f955bf..24219a1 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -66,6 +66,10 @@ QStringList Generator::imageFiles;
 QStringList Generator::imageDirs;
 QStringList Generator::exampleDirs;
 QStringList Generator::exampleImgExts;
+QStringList Generator::scriptFiles;
+QStringList Generator::scriptDirs;
+QStringList Generator::styleFiles;
+QStringList Generator::styleDirs;
 QString Generator::outDir;
 QString Generator::project;
 
@@ -124,10 +128,20 @@ void Generator::initialize(const Config &config)
         if (!dirInfo.mkdir(outDir + "/images/used-in-examples"))
             config.lastLocation().fatal(tr("Cannot create output directory '%1'")
                                         .arg(outDir + "/images/used-in-examples"));
+        if (!dirInfo.mkdir(outDir + "/scripts"))
+            config.lastLocation().fatal(tr("Cannot create output directory '%1'")
+                                        .arg(outDir + "/scripts"));
+        if (!dirInfo.mkdir(outDir + "/style"))
+            config.lastLocation().fatal(tr("Cannot create output directory '%1'")
+                                        .arg(outDir + "/style"));
     }
 
     imageFiles = config.getStringList(CONFIG_IMAGES);
     imageDirs = config.getStringList(CONFIG_IMAGEDIRS);
+    scriptFiles = config.getStringList(CONFIG_SCRIPTS);
+    scriptDirs = config.getStringList(CONFIG_SCRIPTDIRS);
+    styleFiles = config.getStringList(CONFIG_STYLES);
+    styleDirs = config.getStringList(CONFIG_STYLEDIRS);
     exampleDirs = config.getStringList(CONFIG_EXAMPLEDIRS);
     exampleImgExts = config.getStringList(CONFIG_EXAMPLES + Config::dot +
                                           CONFIG_IMAGEEXTENSIONS);
@@ -165,6 +179,47 @@ void Generator::initialize(const Config &config)
                                      "/images");
                 ++e;
             }
+
+            QStringList noExts;
+            QStringList scripts =
+                config.getStringList(CONFIG_SCRIPTS+Config::dot+(*g)->format());
+            e = scripts.begin();
+            while (e != scripts.end()) {
+                QString userFriendlyFilePath;
+                QString filePath = Config::findFile(config.lastLocation(),
+                                                    scriptFiles,
+                                                    scriptDirs,
+                                                    *e,
+                                                    noExts,
+                                                    userFriendlyFilePath);
+                if (!filePath.isEmpty())
+                    Config::copyFile(config.lastLocation(),
+                                     filePath,
+                                     userFriendlyFilePath,
+                                     (*g)->outputDir() +
+                                     "/scripts");
+                ++e;
+            }
+
+            QStringList styles =
+                config.getStringList(CONFIG_STYLES+Config::dot+(*g)->format());
+            e = styles.begin();
+            while (e != styles.end()) {
+                QString userFriendlyFilePath;
+                QString filePath = Config::findFile(config.lastLocation(),
+                                                    styleFiles,
+                                                    styleDirs,
+                                                    *e,
+                                                    noExts,
+                                                    userFriendlyFilePath);
+                if (!filePath.isEmpty())
+                    Config::copyFile(config.lastLocation(),
+                                     filePath,
+                                     userFriendlyFilePath,
+                                     (*g)->outputDir() +
+                                     "/style");
+                ++e;
+            }
         }
         ++g;
     }