Merge commit 'origin/4.5'

Conflicts:
	src/3rdparty/phonon/qt7/mediaobject.mm
	src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
	src/gui/text/qfontengine_win.cpp
	tools/linguist/shared/cpp.cpp

1 files changed, 3 insertions, 0 deletions

diff --git a/tools/assistant/lib/qhelpdbreader.cpp b/tools/assistant/lib/qhelpdbreader.cpp
index 76994a7..27bc4d7 100644
--- a/tools/assistant/lib/qhelpdbreader.cpp
+++ b/tools/assistant/lib/qhelpdbreader.cpp
@@ -92,6 +92,9 @@ bool QHelpDBReader::init()
     QSqlDatabase db = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), m_uniqueId);
     db.setDatabaseName(m_dbName);
     if (!db.open()) {
+        /*: The placeholders are: %1 - The name of the database which cannot be opened
+                                  %2 - The unique id for the connection
+                                  %3 - The actual error string */
         m_error = tr("Cannot open database '%1' '%2': %3").arg(m_dbName, m_uniqueId, db.lastError().text());
         QSqlDatabase::removeDatabase(m_uniqueId);
         return false;