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

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
  fix "configure -fast" on Windows for other maketools than nmake
  Get qmake to add pdb files to install target in debug configuration.
  add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX
  give symbian an own platform mode
  deprecate -win32/-unix/-macx which set both host and target mode
  decouple host platform mode from target platform mode
  factor out applyHostMode()
  make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins
  use QDir::separator() instead of Option::dir_sep where appropriate
  simplify string ops
  sanitize evaluation of OS scopes
  instead of hard-coding recursion for symbian, add it to the specs
  add possibility to request project recursion from within a pro file
  fix ts-assistant target
  use QList::reserve() as appropriate
  optimize appending of (empty) lists to (empty) lists
  suppress pointer aliasing warnings
  Fix compilation with namespace.
  Assistant: Make ~AbstractHelpViewer() virtual.
  Prepare German translations for 4.7 (except Quick).
  ...

5 files changed, 12 insertions, 12 deletions

diff --git a/tools/assistant/lib/qhelpsearchresultwidget.cpp b/tools/assistant/lib/qhelpsearchresultwidget.cpp
index 8e476d5..2f5489b 100644
--- a/tools/assistant/lib/qhelpsearchresultwidget.cpp
+++ b/tools/assistant/lib/qhelpsearchresultwidget.cpp
@@ -304,7 +304,7 @@ private:
                 last = resultLastToShow > count ? count : resultLastToShow;
             }
         }
-        hitsLabel->setText(QHelpSearchResultWidget::tr("%1 - %2 of %3 Hits").arg(first).arg(last).arg(count));
+        hitsLabel->setText(QHelpSearchResultWidget::tr("%1 - %2 of %n Hits", 0, count).arg(first).arg(last));
     }
 
 private:
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index 70f562e..b9a1b0e 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -148,7 +148,7 @@ void BookmarkManager::takeBookmarksMenu(QMenu* menu)
 void BookmarkManager::addBookmark(const QString &title, const QString &url)
 {
     TRACE_OBJ
-    showBookmarkDialog(title.isEmpty() ? tr("Untiled") : title,
+    showBookmarkDialog(title.isEmpty() ? tr("Untitled") : title,
         url.isEmpty() ? QLatin1String("about:blank") : url);
 }
 
diff --git a/tools/assistant/tools/assistant/cmdlineparser.cpp b/tools/assistant/tools/assistant/cmdlineparser.cpp
index bbc0c37..b6c0beb 100644
--- a/tools/assistant/tools/assistant/cmdlineparser.cpp
+++ b/tools/assistant/tools/assistant/cmdlineparser.cpp
@@ -167,10 +167,10 @@ void CmdLineParser::handleCollectionFileOption()
         const QString &fileName = nextArg();
         m_collectionFile = getFileName(fileName);
         if (m_collectionFile.isEmpty())
-            m_error = tr("The collection file '%1' does not exist!").
+            m_error = tr("The collection file '%1' does not exist.").
                           arg(fileName);
     } else {
-        m_error = tr("Missing collection file!");
+        m_error = tr("Missing collection file.");
     }
 }
 
@@ -183,9 +183,9 @@ void CmdLineParser::handleShowUrlOption()
         if (url.isValid()) {
             m_url = url;
         } else
-            m_error = tr("Invalid URL '%1'!").arg(urlString);
+            m_error = tr("Invalid URL '%1'.").arg(urlString);
     } else {
-        m_error = tr("Missing URL!");
+        m_error = tr("Missing URL.");
     }
 }
 
@@ -223,7 +223,7 @@ void CmdLineParser::handleShowOrHideOrActivateOption(ShowState state)
         else
             m_error = tr("Unknown widget: %1").arg(widget);
     } else {
-        m_error = tr("Missing widget!");
+        m_error = tr("Missing widget.");
     }
 }
 
@@ -246,11 +246,11 @@ void CmdLineParser::handleRegisterOrUnregisterOption(RegisterState state)
         const QString &fileName = nextArg();
         m_helpFile = getFileName(fileName);
         if (m_helpFile.isEmpty())
-            m_error = tr("The Qt help file '%1' does not exist!").arg(fileName);
+            m_error = tr("The Qt help file '%1' does not exist.").arg(fileName);
         else
             m_register = state;
     } else {
-        m_error = tr("Missing help file!");
+        m_error = tr("Missing help file.");
     }
 }
 
@@ -260,7 +260,7 @@ void CmdLineParser::handleSetCurrentFilterOption()
     if (hasMoreArgs())
         m_currentFilter = nextArg();
     else
-        m_error = tr("Missing filter argument!");
+        m_error = tr("Missing filter argument.");
 }
 
 QString CmdLineParser::getFileName(const QString &fileName)
diff --git a/tools/assistant/tools/assistant/helpviewer.h b/tools/assistant/tools/assistant/helpviewer.h
index 0bfe904..9e8f5f4 100644
--- a/tools/assistant/tools/assistant/helpviewer.h
+++ b/tools/assistant/tools/assistant/helpviewer.h
@@ -53,7 +53,7 @@ class AbstractHelpViewer
 {
 public:
     AbstractHelpViewer();
-    ~AbstractHelpViewer();
+    virtual ~AbstractHelpViewer();
 
     virtual QFont viewerFont() const = 0;
     virtual void setViewerFont(const QFont &font) = 0;
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 0ff7301..c0a29ca 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3723,7 +3723,7 @@ void Configure::generateMakefiles()
                     QTextStream txt(&file);
                     txt << "all:\n";
                     txt << "\t" << args.join(" ") << "\n";
-                    txt << "\t" << dictionary[ "MAKE" ] << " -f " << it->target << "\n";
+                    txt << "\t\"$(MAKE)\" -$(MAKEFLAGS) -f " << it->target << "\n";
                     txt << "first: all\n";
                     txt << "qmake:\n";
                     txt << "\t" << args.join(" ") << "\n";