Merge remote-tracking branch 'origin/6.0' into 7.0

Change-Id: Ie2b23daa457c2aed635a784963bc1e95740bd076
2022-02-02 10:17:03 +01:00
parent 1221552377 f95636a820
commit 1368111824
91 changed files with 1461 additions and 913 deletions
--- a/src/plugins/qmldesigner/generatecmakelists.cpp
+++ b/src/plugins/qmldesigner/generatecmakelists.cpp
@@ -205,8 +205,6 @@ bool showConfirmationDialog(const Utils::FilePath &rootDir)
        files.append(file.filePath);

    CmakeGeneratorDialog dialog(rootDir, files);
-    dialog.setMinimumWidth(600);
-    dialog.setMinimumHeight(640);
    if (dialog.exec()) {
        Utils::FilePaths confirmedFiles = dialog.getFilePaths();
        removeUnconfirmedQueuedFiles(confirmedFiles);