Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/corelib/kernel/qobject.h
	src/declarative/graphicsitems/qdeclarativeflickable.cpp
	src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
	src/declarative/util/qdeclarativelistmodel.cpp

3 files changed, 4 insertions, 4 deletions

diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp
index dc35b2d..8a5bb9c 100644
--- a/tools/assistant/tools/assistant/helpenginewrapper.cpp
+++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp
@@ -115,7 +115,7 @@ private:
     QMap<QString, RecentSignal> m_recentQchUpdates;
 };
 
-const QString HelpEngineWrapper::TrUnfiltered = tr("Unfiltered");
+const QString HelpEngineWrapper::TrUnfiltered = HelpEngineWrapper::tr("Unfiltered");
 
 HelpEngineWrapper *HelpEngineWrapper::helpEngineWrapper = 0;
 
diff --git a/tools/assistant/tools/qhelpconverter/filespage.cpp b/tools/assistant/tools/qhelpconverter/filespage.cpp
index 4ebf391..fd4a40e 100644
--- a/tools/assistant/tools/qhelpconverter/filespage.cpp
+++ b/tools/assistant/tools/qhelpconverter/filespage.cpp
@@ -59,8 +59,8 @@ FilesPage::FilesPage(QWidget *parent)
     connect(m_ui.removeAllButton, SIGNAL(clicked()),
         this, SLOT(removeAllFiles()));
 
-    m_ui.fileLabel->setText(tr("<p><b>Warning:</b> Be aware "
-        "when removing images or stylesheets since those files "
+    m_ui.fileLabel->setText(tr("<p><b>Warning:</b> "
+        "When removing images or stylesheets, be aware that those files "
         "are not directly referenced by the .adp or .dcf "
         "file.</p>"));
 }
diff --git a/tools/assistant/tools/qhelpconverter/filterpage.cpp b/tools/assistant/tools/qhelpconverter/filterpage.cpp
index c782943..c15a580 100644
--- a/tools/assistant/tools/qhelpconverter/filterpage.cpp
+++ b/tools/assistant/tools/qhelpconverter/filterpage.cpp
@@ -50,7 +50,7 @@ FilterPage::FilterPage(QWidget *parent)
     setTitle(tr("Filter Settings"));
     setSubTitle(tr("Specify the filter attributes for the "
         "documentation. If filter attributes are used, "
-        "also define a custom filter for it. Both, the "
+        "also define a custom filter for it. Both the "
         "filter attributes and the custom filters are "
         "optional."));