From 31e00882230165f4d7293d59bac2386967900a85 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 4 Sep 2019 17:37:25 +0200 Subject: [PATCH 1/4] Doc: Make description of "Rebuild" function apply to all build systems It claimed that qmake is always run, which is incorrect for CMake and Qbs. Change-Id: I80f72d750a02a16b26514bb868f1d0f64124ef56 Reviewed-by: Mitch Curtis Reviewed-by: Tobias Hunger --- .../projects/creator-only/creator-projects-building.qdoc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/src/projects/creator-only/creator-projects-building.qdoc b/doc/src/projects/creator-only/creator-projects-building.qdoc index 774040fb4da..ea9bc1d230e 100644 --- a/doc/src/projects/creator-only/creator-projects-building.qdoc +++ b/doc/src/projects/creator-only/creator-projects-building.qdoc @@ -79,9 +79,10 @@ subproject. To remove all build artifacts, select \uicontrol Build > \uicontrol {Clean All} or - \uicontrol {Clean Project}. To clean the build directory, run qmake, and - then build the project, select \uicontrol Build > \uicontrol {Rebuild All} - or \uicontrol {Rebuild Project}. + \uicontrol {Clean Project}. To clean the build directory and then build + the project, select \uicontrol Build > \uicontrol {Rebuild All} or + \uicontrol {Rebuild Project}. If you use qmake, rebuilding also runs qmake + to generate new Makefiles between cleaning and building. To build and clean projects without dependencies, select the \uicontrol {Build Without Dependencies}, @@ -89,6 +90,8 @@ \uicontrol {Clean Without Dependencies} options in the context menu in the \uicontrol Projects view. + \section1 Additional qmake Options + To run qmake to generate new Makefiles, select \uicontrol Build > \uicontrol qmake. To prevent failures on incremental builds, it might make sense to always run qmake before building, even though it means that From 6808c891fb9a088e89513e97bb3c0a93ef5f421c Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 12 Sep 2019 10:29:55 +0200 Subject: [PATCH 2/4] Tests: Fix expectation for parent of COM port Keep expected path in line with result when using QFileInfo. Change-Id: I8d323212d1627b81de01582c368a4e9ffbba734c Reviewed-by: Orgad Shaneh --- tests/auto/utils/fileutils/tst_fileutils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp index 2102bd0f06f..c13db0bf551 100644 --- a/tests/auto/utils/fileutils/tst_fileutils.cpp +++ b/tests/auto/utils/fileutils/tst_fileutils.cpp @@ -63,7 +63,7 @@ void tst_fileutils::parentDir_data() #ifdef Q_OS_WIN QTest::newRow("C:/data") << "C:/data" << "C:/" << ""; QTest::newRow("C:/") << "C:/" << "" << ""; - QTest::newRow("//./com1") << "//./com1" << "/" << ""; + QTest::newRow("//./com1") << "//./com1" << "//." << ""; QTest::newRow("//?/path") << "//?/path" << "/" << "Qt 4 cannot handle this path."; QTest::newRow("/Global?\?/UNC/host") << "/Global?\?/UNC/host" << "/Global?\?/UNC/host" << "Qt 4 cannot handle this path."; From 1ff337089a579cf698df0ddb6bf8a68ea9e5de2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Mon, 9 Sep 2019 18:31:03 -0300 Subject: [PATCH 3/4] ClangFormat: improve the message the users see In this way it's made clear that the plugin requires a patched version of Clang. Task-number: QTCREATORBUG-22923 Change-Id: Ifefd5ab1a3dc82b85e553c5e1fedffb72919dd17 Reviewed-by: Nikolai Kosjar --- src/plugins/clangformat/clangformatplugin.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp index 81f95ccba74..1f3ea8d475a 100644 --- a/src/plugins/clangformat/clangformatplugin.cpp +++ b/src/plugins/clangformat/clangformatplugin.cpp @@ -155,8 +155,9 @@ bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorS } return true; #else - *errorString = "Disabling ClangFormat plugin as it is not built against a suitable version of " - "Clang's libFormat. For more information, see the Qt Creator README at " +#warning ClangFormat: building dummy plugin due to unmodified Clang, see README.md for more info + *errorString = "Disabling ClangFormat plugin as it has not been built against a modified Clang's libFormat." + "For more information see the Qt Creator README at " "https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/README.md"; return false; #endif From 73106f330a341f7b1226b45e56856892b2b677ca Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 13 Sep 2019 13:03:00 +0200 Subject: [PATCH 4/4] QmlDesigner: Fix pasteKeyframesToTarget() Because we attached the model inside the transaction, then transaction begin message was not handled properly. Change-Id: I77a56d7874061c0af907047e38a37fec4dab12c1 Reviewed-by: Tim Jenssen --- .../qmldesigner/components/timelineeditor/timelineactions.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp index 4751765874b..4d2523b3a37 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp @@ -104,11 +104,9 @@ void TimelineActions::pasteKeyframesToTarget(const ModelNode &targetNode, pasteModel->detachView(&view); + targetNode.view()->model()->attachView(&view); view.executeInTransaction("TimelineActions::pasteKeyframesToTarget", [=, &view](){ - - targetNode.view()->model()->attachView(&view); - ModelNode nonConstTargetNode = targetNode; nonConstTargetNode.validId();