diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 03:01:47 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 03:01:47 +0100 |
| commit | be187fbdc65b41531eee7fed63567d6d05f58b52 (patch) | |
| tree | 07f7f0db975b93dc49184c270e0cddd337e98fd1 | |
| parent | 2055c451f8ff2b2f5e7de105454790d7b240a6b3 (diff) | |
| parent | 802aa37f7725ca3d75d1e928d845c6df534943ba (diff) | |
| download | qttools-be187fbdc65b41531eee7fed63567d6d05f58b52.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iff999e458326e9d620895f9e799a64c06a12185e
| -rw-r--r-- | src/qdoc/htmlgenerator.cpp | 12 | ||||
| -rw-r--r-- | src/windeployqt/main.cpp | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 8fcb8817f..c1d242e20 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -2109,9 +2109,7 @@ void HtmlGenerator::generateHeader(const QString& title, if (node && !node->doc().location().isEmpty()) out() << "<!-- " << node->doc().location().fileName() << " -->\n"; - QString shortVersion = qdb_->version(); - if (shortVersion.count(QChar('.')) == 2) - shortVersion.truncate(shortVersion.lastIndexOf(QChar('.'))); + QString projectVersion = qdb_->version(); //determine the rest of the <title> element content: "title | titleSuffix version" QString titleSuffix; @@ -2140,8 +2138,8 @@ void HtmlGenerator::generateHeader(const QString& title, titleSuffix.clear(); //for pages that duplicate the version, clear the duplicate - if (title.contains(shortVersion) || titleSuffix.contains(shortVersion)) - shortVersion.clear(); + if (title.contains(projectVersion) || titleSuffix.contains(projectVersion)) + projectVersion.clear(); QString divider; if (!titleSuffix.isEmpty() && !title.isEmpty()) @@ -2153,8 +2151,8 @@ void HtmlGenerator::generateHeader(const QString& title, << divider << titleSuffix; - if (!shortVersion.isEmpty()) - out() << QLatin1Char(' ') << shortVersion; + if (!projectVersion.isEmpty()) + out() << QLatin1Char(' ') << projectVersion; out() << "</title>\n"; diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 2266e84da..f3c0e5fd7 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -40,7 +40,12 @@ #include <QtCore/QOperatingSystemVersion> #include <QtCore/QSharedPointer> #include <QtCore/QVector> + +#ifdef Q_OS_WIN #include <QtCore/qt_windows.h> +#else +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 +#endif #include <algorithm> #include <iostream> @@ -1111,6 +1116,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned result.append(dllFi.absoluteFilePath()); } break; +#ifdef Q_OS_WIN case WindowsDesktop: { // MSVC/Desktop: Add redistributable packages. QString vcRedistDirName = vcRedistDir(); if (vcRedistDirName.isEmpty()) @@ -1150,6 +1156,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned result.append(redistFiles); } break; +#endif // Q_OS_WIN default: break; } |