summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-27 01:01:36 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-10-28 10:49:23 +0000
commit829066432f92946fb0d26d8134bd4a9209fb5fe4 (patch)
treea616379f36791748dcd3a9f934981aba073999e6
parent17c34f40c51077f01f53c1aa48b01e1a3c3df51c (diff)
parent6f90e51ac048be83ddbb20addcf88eca9ea68d9f (diff)
downloadqttools-829066432f92946fb0d26d8134bd4a9209fb5fe4.tar.gz
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
-rw-r--r--src/assistant/assistant/preferencesdialog.cpp1
-rw-r--r--src/macdeployqt/shared/shared.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/assistant/assistant/preferencesdialog.cpp b/src/assistant/assistant/preferencesdialog.cpp
index d231f7a30..796c674ea 100644
--- a/src/assistant/assistant/preferencesdialog.cpp
+++ b/src/assistant/assistant/preferencesdialog.cpp
@@ -382,6 +382,7 @@ QList<int> PreferencesDialog::currentRegisteredDocsSelection() const
QList<int> result;
for (const QModelIndex &index : m_ui.registeredDocsListView->selectionModel()->selectedRows())
result.append(m_registereredDocsFilterModel->mapToSource(index).row());
+ std::sort(result.begin(), result.end());
return result;
}
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index 33d29ecc2..3dff0117e 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -647,6 +647,7 @@ void recursiveCopyAndDeploy(const QString &appBundlePath, const QSet<QString> &r
QDir().mkpath(destinationPath);
LogNormal() << "copy:" << sourcePath << destinationPath;
+ const bool isDwarfPath = sourcePath.endsWith("DWARF");
QStringList files = QDir(sourcePath).entryList(QStringList() << QStringLiteral("*"), QDir::Files | QDir::NoDotAndDotDot);
foreach (QString file, files) {
@@ -654,7 +655,7 @@ void recursiveCopyAndDeploy(const QString &appBundlePath, const QSet<QString> &r
if (file.endsWith("_debug.dylib")) {
continue; // Skip debug versions
- } else if (file.endsWith(QStringLiteral(".dylib"))) {
+ } else if (!isDwarfPath && file.endsWith(QStringLiteral(".dylib"))) {
// App store code signing rules forbids code binaries in Contents/Resources/,
// which poses a problem for deploying mixed .qml/.dylib Qt Quick imports.
// Solve this by placing the dylibs in Contents/PlugIns/quick, and then