Merge "Merge remote-tracking branch 'origin/5.9.0' into 5.9" into refs/staging/5.9

5 files changed, 72 insertions, 22 deletions

diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 000000000..e113ee6f9
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,34 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+Linguist
+--------
+
+ - [QTBUG-16368] Added capability of checking that the whitespace
+   surrounding the translations' text matches that of the source strings.
+
+Assistant
+---------
+
+ - Removed the clucene dependency, used FTS5 from sqlite instead.
+ - Search results show now the doc excerpt instead of the explicit link.
+ - Made search results more reliable (e.g.: charset, "UTF-8").
+
+QtHelp
+-----------
+
+ - Moved the linksForKeyword() method from QHelpIndexModel into QHelpEngineCore.
diff --git a/src/assistant/help/qhelpenginecore.cpp b/src/assistant/help/qhelpenginecore.cpp
index 4debf8247..b3396f2fe 100644
--- a/src/assistant/help/qhelpenginecore.cpp
+++ b/src/assistant/help/qhelpenginecore.cpp
@@ -640,6 +640,21 @@ QMap<QString, QUrl> QHelpEngineCore::linksForIdentifier(const QString &id) const
 }
 
 /*!
+    \since 4.5
+
+    Returns all documents found for the \a keyword. The returned map consists of the
+    document titles and their URLs.
+*/
+QMap<QString, QUrl> QHelpEngineCore::linksForKeyword(const QString &keyword) const
+{
+    QMap<QString, QUrl> linkMap;
+    const QStringList &attributes = filterAttributes(d->currentFilter);
+    for (const QHelpDBReader *reader : qAsConst(d->readerMap))
+        reader->linksForKeyword(keyword, attributes, &linkMap);
+    return linkMap;
+}
+
+/*!
     Removes the \a key from the settings section in the
     collection file. Returns true if the value was removed
     successfully, otherwise false.
diff --git a/src/assistant/help/qhelpenginecore.h b/src/assistant/help/qhelpenginecore.h
index 47c136fe4..c3e446b05 100644
--- a/src/assistant/help/qhelpenginecore.h
+++ b/src/assistant/help/qhelpenginecore.h
@@ -95,6 +95,7 @@ public:
     QByteArray fileData(const QUrl &url) const;
 
     QMap<QString, QUrl> linksForIdentifier(const QString &id) const;
+    QMap<QString, QUrl> linksForKeyword(const QString &keyword) const;
 
     bool removeCustomValue(const QString &key);
     QVariant customValue(const QString &key,
diff --git a/src/assistant/help/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp
index 5cb4a56d4..abd3b40e8 100644
--- a/src/assistant/help/qhelpindexwidget.cpp
+++ b/src/assistant/help/qhelpindexwidget.cpp
@@ -277,16 +277,12 @@ bool QHelpIndexModel::isCreatingIndex() const
 }
 
 /*!
-    Returns all documents found for the \a keyword. The returned map consists of the
-    document titles and their URLs.
+    \obsolete
+    Use QHelpEngineCore::linksForKeyword() instead.
 */
 QMap<QString, QUrl> QHelpIndexModel::linksForKeyword(const QString &keyword) const
 {
-    QMap<QString, QUrl> linkMap;
-    const QStringList &attributes = d->helpEngine->q->filterAttributes(d->currentFilter);
-    for (const QHelpDBReader *reader : d->activeReaders)
-        reader->linksForKeyword(keyword, attributes, &linkMap);
-    return linkMap;
+    return d->helpEngine->q->linksForKeyword(keyword);
 }
 
 /*!
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 0b4af9e0b..2bfef09f8 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -731,17 +731,11 @@ static QString pdbFileName(QString libraryFileName)
     libraryFileName.replace(lastDot, libraryFileName.size() - lastDot, QLatin1String("pdb"));
     return libraryFileName;
 }
-
 static inline QStringList qmlCacheFileFilters()
 {
     return QStringList() << QStringLiteral("*.jsc") << QStringLiteral("*.qmlc");
 }
 
-static bool hasQmlCacheFiles(const QString &path)
-{
-    return !QDir(path).entryInfoList(qmlCacheFileFilters(), QDir::Files).isEmpty();
-}
-
 // File entry filter function for updateFile() that returns a list of files for
 // QML import trees: DLLs (matching debgug) and .qml/,js, etc.
 class QmlDirectoryFileEntryFunction {
@@ -1334,17 +1328,32 @@ static DeployResult deploy(const Options &options,
     // Check for ANGLE on the Qt5Gui library.
     if ((options.platform & WindowsBased) && options.platform != WinCEIntel
         && options.platform != WinCEArm && !qtGuiLibrary.isEmpty())  {
+        QString libGlesName = QStringLiteral("libGLESV2");
+        if (isDebug)
+            libGlesName += QLatin1Char('d');
+        libGlesName += QLatin1String(windowsSharedLibrarySuffix);
         QString libQtAngleName = QStringLiteral("QtANGLE");
         if (isDebug)
             libQtAngleName += QLatin1Char('d');
         libQtAngleName += QLatin1String(windowsSharedLibrarySuffix);
         const QStringList guiLibraries = findDependentLibraries(qtGuiLibrary, options.platform, errorMessage);
-        const bool dependsOnAngle = !guiLibraries.filter(libQtAngleName, Qt::CaseInsensitive).isEmpty();
+        const bool dependsOnAngle = !guiLibraries.filter(libGlesName, Qt::CaseInsensitive).isEmpty();
+        const bool dependsOnNewAngle = !guiLibraries.filter(libQtAngleName, Qt::CaseInsensitive).isEmpty();
         const bool dependsOnOpenGl = !guiLibraries.filter(QStringLiteral("opengl32"), Qt::CaseInsensitive).isEmpty();
         if (options.angleDetection != Options::AngleDetectionForceOff
-            && (dependsOnAngle || !dependsOnOpenGl || options.angleDetection == Options::AngleDetectionForceOn)) {
-            const QString libQtAngleFullPath = qtBinDir + slash + libQtAngleName;
-            deployedQtLibraries.append(libQtAngleFullPath);
+            && (dependsOnAngle || dependsOnNewAngle || !dependsOnOpenGl || options.angleDetection == Options::AngleDetectionForceOn)) {
+            if (dependsOnNewAngle) {
+                const QString libQtAngleFullPath = qtBinDir + slash + libQtAngleName;
+                deployedQtLibraries.append(libQtAngleFullPath);
+            } else {
+                const QString libGlesFullPath = qtBinDir + slash + libGlesName;
+                deployedQtLibraries.append(libGlesFullPath);
+                QString libEglFullPath = qtBinDir + slash + QStringLiteral("libEGL");
+                if (isDebug)
+                    libEglFullPath += QLatin1Char('d');
+                libEglFullPath += QLatin1String(windowsSharedLibrarySuffix);
+                deployedQtLibraries.append(libEglFullPath);
+            }
             // Find the system D3d Compiler matching the D3D library.
             if (options.systemD3dCompiler && !options.isWinRt()) {
                 const QString d3dCompiler = findD3dCompiler(options.platform, qtBinDir, wordSize);
@@ -1452,11 +1461,6 @@ static DeployResult deploy(const Options &options,
                     return result;
                 unsigned updateFileFlags = options.updateFileFlags | SkipQmlDesignerSpecificsDirectories;
                 unsigned qmlDirectoryFileFlags = 0;
-                // QML files of Controls 1 not needed unless cached files are present (5.9)
-                if (quickControlsImportPath(module.sourcePath) == 1 && !hasQmlCacheFiles(module.sourcePath)) {
-                    updateFileFlags |=  RemoveEmptyQmlDirectories;
-                    qmlDirectoryFileFlags |= QmlDirectoryFileEntryFunction::SkipSources;
-                }
                 if (options.deployPdb)
                     qmlDirectoryFileFlags |= QmlDirectoryFileEntryFunction::DeployPdb;
                 if (!updateFile(module.sourcePath, QmlDirectoryFileEntryFunction(options.platform, debugMatchMode, qmlDirectoryFileFlags),