From 7051ba84984b20676ef2de07349e56b0d7bdfa8c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 14 May 2020 08:49:47 +0200 Subject: [PATCH 1/9] Build script: Add option for passing arguments to build command So one can pass e.g. -j3 when locally testing while still doing other things Change-Id: I7a528884f19698290e49c372eb31030afe609d23 Reviewed-by: Eike Ziller --- scripts/build.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/build.py b/scripts/build.py index 8102224cd8b..e7e414f5087 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -87,6 +87,8 @@ def get_arguments(): action='store_true', default=False) parser.add_argument('--no-zip', help='Skip creation of 7zip files for install and developer package', action='store_true', default=False) + parser.add_argument('--add-make-arg', help='Passes the argument to the make tool.', + action='append', dest='make_args', default=[]) return parser.parse_args() def build_qtcreator(args, paths): @@ -137,7 +139,10 @@ def build_qtcreator(args, paths): '-DIDE_REVISION_URL=https://code.qt.io/cgit/qt-creator/qt-creator.git/log/?id=' + ide_revision] common.check_print_call(cmake_args + [paths.src], paths.build) - common.check_print_call(['cmake', '--build', '.'], paths.build) + build_args = ['cmake', '--build', '.'] + if args.make_args: + build_args += ['--'] + args.make_args + common.check_print_call(build_args, paths.build) if not args.no_docs: common.check_print_call(['cmake', '--build', '.', '--target', 'docs'], paths.build) From 9e31378b50305ac92e21c2bbb7624cbe189850bc Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 18 May 2020 09:24:54 +0300 Subject: [PATCH 2/9] Android: use latest ndk version instead of ndk-bundle Fixes: QTCREATORBUG-23903 Change-Id: Iae3561818d86952dad9209d55984c82498d07575 Reviewed-by: BogDan Vatra --- share/qtcreator/android/sdk_definitions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/android/sdk_definitions.json b/share/qtcreator/android/sdk_definitions.json index 7bce8d66588..c88926b8739 100644 --- a/share/qtcreator/android/sdk_definitions.json +++ b/share/qtcreator/android/sdk_definitions.json @@ -18,8 +18,8 @@ "specific_qt_versions": [ { "versions": ["default"], - "sdk_essential_packages": ["build-tools;29.0.2", "ndk-bundle"], - "ndk_path": "ndk-bundle" + "sdk_essential_packages": ["build-tools;29.0.2", "ndk;21.1.6352462"], + "ndk_path": "ndk/21.1.6352462" }, { "versions": ["5.12.[0-5]", "5.13.[0-1]"], From ec6782016ea18dd6dcbcf41cffd32ad86127098d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 18 May 2020 10:28:59 +0200 Subject: [PATCH 3/9] Update change log for 4.12.1 Change-Id: I25cce97a5a0a871e24c8898f3bb37e09199a9872 Reviewed-by: Leena Miettinen --- dist/changes-4.12.1.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dist/changes-4.12.1.md b/dist/changes-4.12.1.md index 8a80e1f0f71..c4dd7865464 100644 --- a/dist/changes-4.12.1.md +++ b/dist/changes-4.12.1.md @@ -14,6 +14,7 @@ General ------- * Fixed crash when changing font settings (QTCREATORBUG-14385) +* Fixed availability of `Link with Qt` information on startup (QTCREATORBUG-23900) Editing ------- @@ -39,6 +40,10 @@ Projects * Fixed issue with JOM (QTCREATORBUG-22645) +### Qbs + +* Fixed crash when updating project (QTCREATORBUG-23924) + ### Compilation Database * Fixed issues with symbolic links (QTCREATORBUG-23511) @@ -46,8 +51,13 @@ Projects Debugging --------- +* Fixed startup when Python's JSON module is missing (QTCREATORBUG-24004) * Fixed pretty printing of `std::unique_ptr` with custom deleter (QTCREATORBUG-23885) +### GDB + +* Fixed handling of register addresses with lowercase characters +* Fixed issue with GDB reporting zero array size in some cases (QTCREATORBUG-23998) Qt Quick Designer ----------------- @@ -67,10 +77,39 @@ Platforms * Fixed crash at startup when Qt is missing in Kit (QTCREATORBUG-23963) * Fixed `Always use this device for this project` (QTCREATORBUG-23918) +* Fixed issue with "side by side" NDK installation (QTCREATORBUG-23903) ### OpenBSD * Fixed Qt ABI detection (QTCREATORBUG-23818) +### MCU + +* Fixed various issues with Kit creation and cleanup + Credits for these changes go to: -------------------------------- +Alessandro Portale +André Pönitz +Assam Boudjelthia +Brook Cronin +Christian Kandeler +Christian Stenger +Cristian Adam +David Schulz +Eike Ziller +Friedemann Kleint +Henning Gruendl +Jeremy Ephron +Johanna Vanhatapio +Leander Schulten +Leena Miettinen +Nikolai Kosjar +Robert Löhning +Sebastian Verling +Sergey Belyashov +Thiago Macieira +Thomas Hartmann +Tim Jenssen +Venugopal Shivashankar +Vikas Pachdha From 73d45a994b673c66a8965c0c67ab184ece45e0a0 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Mon, 18 May 2020 11:49:52 +0200 Subject: [PATCH 4/9] Doc: Ensure QDoc finds Qt Design Studio examples The name of the example project directory must match with the project file name and the \example command argument. This is case sensitive on platforms other than Windows. Change-Id: Ie6fa6934ee444b42f024ebf00d6a9b20dfd6abce Reviewed-by: Paul Wicking Reviewed-by: Leena Miettinen --- .../ClusterTutorial.qmlproject | 0 .../{coffeemachine => CoffeeMachine}/ApplicationFlow.qml | 0 .../examples/{coffeemachine => CoffeeMachine}/CoffeeButton.qml | 0 .../{coffeemachine => CoffeeMachine}/CoffeeMachine.qmlproject | 0 .../examples/{coffeemachine => CoffeeMachine}/SideBar.qml | 0 .../{ebikedesign => EBikeDesign}/EBikeDesign.qmlproject | 0 .../examples/{sidemenu => SideMenu}/CustomButton.qml | 0 doc/qtdesignstudio/examples/{sidemenu => SideMenu}/SideMenu.qml | 0 .../examples/{sidemenu => SideMenu}/SideMenu.qmlproject | 0 .../{webinardemo => WebinarDemo}/WebinarDemo.qmlproject | 0 doc/qtdesignstudio/examples/doc/progressbar.qdoc | 2 +- 11 files changed, 1 insertion(+), 1 deletion(-) rename doc/qtdesignstudio/examples/{clustertutorial => ClusterTutorial}/ClusterTutorial.qmlproject (100%) rename doc/qtdesignstudio/examples/{coffeemachine => CoffeeMachine}/ApplicationFlow.qml (100%) rename doc/qtdesignstudio/examples/{coffeemachine => CoffeeMachine}/CoffeeButton.qml (100%) rename doc/qtdesignstudio/examples/{coffeemachine => CoffeeMachine}/CoffeeMachine.qmlproject (100%) rename doc/qtdesignstudio/examples/{coffeemachine => CoffeeMachine}/SideBar.qml (100%) rename doc/qtdesignstudio/examples/{ebikedesign => EBikeDesign}/EBikeDesign.qmlproject (100%) rename doc/qtdesignstudio/examples/{sidemenu => SideMenu}/CustomButton.qml (100%) rename doc/qtdesignstudio/examples/{sidemenu => SideMenu}/SideMenu.qml (100%) rename doc/qtdesignstudio/examples/{sidemenu => SideMenu}/SideMenu.qmlproject (100%) rename doc/qtdesignstudio/examples/{webinardemo => WebinarDemo}/WebinarDemo.qmlproject (100%) diff --git a/doc/qtdesignstudio/examples/clustertutorial/ClusterTutorial.qmlproject b/doc/qtdesignstudio/examples/ClusterTutorial/ClusterTutorial.qmlproject similarity index 100% rename from doc/qtdesignstudio/examples/clustertutorial/ClusterTutorial.qmlproject rename to doc/qtdesignstudio/examples/ClusterTutorial/ClusterTutorial.qmlproject diff --git a/doc/qtdesignstudio/examples/coffeemachine/ApplicationFlow.qml b/doc/qtdesignstudio/examples/CoffeeMachine/ApplicationFlow.qml similarity index 100% rename from doc/qtdesignstudio/examples/coffeemachine/ApplicationFlow.qml rename to doc/qtdesignstudio/examples/CoffeeMachine/ApplicationFlow.qml diff --git a/doc/qtdesignstudio/examples/coffeemachine/CoffeeButton.qml b/doc/qtdesignstudio/examples/CoffeeMachine/CoffeeButton.qml similarity index 100% rename from doc/qtdesignstudio/examples/coffeemachine/CoffeeButton.qml rename to doc/qtdesignstudio/examples/CoffeeMachine/CoffeeButton.qml diff --git a/doc/qtdesignstudio/examples/coffeemachine/CoffeeMachine.qmlproject b/doc/qtdesignstudio/examples/CoffeeMachine/CoffeeMachine.qmlproject similarity index 100% rename from doc/qtdesignstudio/examples/coffeemachine/CoffeeMachine.qmlproject rename to doc/qtdesignstudio/examples/CoffeeMachine/CoffeeMachine.qmlproject diff --git a/doc/qtdesignstudio/examples/coffeemachine/SideBar.qml b/doc/qtdesignstudio/examples/CoffeeMachine/SideBar.qml similarity index 100% rename from doc/qtdesignstudio/examples/coffeemachine/SideBar.qml rename to doc/qtdesignstudio/examples/CoffeeMachine/SideBar.qml diff --git a/doc/qtdesignstudio/examples/ebikedesign/EBikeDesign.qmlproject b/doc/qtdesignstudio/examples/EBikeDesign/EBikeDesign.qmlproject similarity index 100% rename from doc/qtdesignstudio/examples/ebikedesign/EBikeDesign.qmlproject rename to doc/qtdesignstudio/examples/EBikeDesign/EBikeDesign.qmlproject diff --git a/doc/qtdesignstudio/examples/sidemenu/CustomButton.qml b/doc/qtdesignstudio/examples/SideMenu/CustomButton.qml similarity index 100% rename from doc/qtdesignstudio/examples/sidemenu/CustomButton.qml rename to doc/qtdesignstudio/examples/SideMenu/CustomButton.qml diff --git a/doc/qtdesignstudio/examples/sidemenu/SideMenu.qml b/doc/qtdesignstudio/examples/SideMenu/SideMenu.qml similarity index 100% rename from doc/qtdesignstudio/examples/sidemenu/SideMenu.qml rename to doc/qtdesignstudio/examples/SideMenu/SideMenu.qml diff --git a/doc/qtdesignstudio/examples/sidemenu/SideMenu.qmlproject b/doc/qtdesignstudio/examples/SideMenu/SideMenu.qmlproject similarity index 100% rename from doc/qtdesignstudio/examples/sidemenu/SideMenu.qmlproject rename to doc/qtdesignstudio/examples/SideMenu/SideMenu.qmlproject diff --git a/doc/qtdesignstudio/examples/webinardemo/WebinarDemo.qmlproject b/doc/qtdesignstudio/examples/WebinarDemo/WebinarDemo.qmlproject similarity index 100% rename from doc/qtdesignstudio/examples/webinardemo/WebinarDemo.qmlproject rename to doc/qtdesignstudio/examples/WebinarDemo/WebinarDemo.qmlproject diff --git a/doc/qtdesignstudio/examples/doc/progressbar.qdoc b/doc/qtdesignstudio/examples/doc/progressbar.qdoc index 208e97bf8df..0dfb333e41f 100644 --- a/doc/qtdesignstudio/examples/doc/progressbar.qdoc +++ b/doc/qtdesignstudio/examples/doc/progressbar.qdoc @@ -24,7 +24,7 @@ ****************************************************************************/ /*! - \example ProgressBar + \example progressbar \ingroup studioexamples \title Progress Bar From 625a8f3eca580ebca6f595ab5e43547da479e852 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 18 May 2020 13:35:41 +0200 Subject: [PATCH 5/9] Doc: Fix typo "sependencies" > "dependencies" Change-Id: I1d3f3f0bbdcff3d557038d8feca5ffe234d58314 Reviewed-by: Leena Miettinen --- doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc index 5c8cba4870c..395327e1bce 100644 --- a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc @@ -50,7 +50,7 @@ until it is explicitly assigned a new value. However, to make the fullest use of QML and its built-in support for dynamic object behaviors, most QML types use property bindings. This means that you can specify relationships - between different object properties so that when a property's sependencies + between different object properties so that when a property's dependencies change in value, the property's value is automatically updated accordingly. Behind the scenes, the QML engine monitors the property's dependencies (that From 2c6563c69d230e6a44f2cd4e83c4fa1647b04771 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 18 May 2020 10:43:06 +0300 Subject: [PATCH 6/9] Android: make sure to remove the adb daemon logs from devices list Fixes: QTCREATORBUG-21797 Change-Id: I9153a5b2a0da4826179b436945fcc4616d65bb25 Reviewed-by: BogDan Vatra --- src/plugins/android/androidconfigurations.cpp | 5 +++-- src/plugins/android/androidtoolmanager.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index f5ce84007ed..000cc353991 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -617,8 +617,9 @@ QVector AndroidConfig::connectedDevices(const FilePath &adbTo if (adbDevs.empty()) return devices; - while (adbDevs.first().startsWith("* daemon")) - adbDevs.removeFirst(); // remove the daemon logs + for (const QString line : adbDevs) // remove the daemon logs + if (line.startsWith("* daemon")) + adbDevs.removeOne(line); adbDevs.removeFirst(); // remove "List of devices attached" header line // workaround for '????????????' serial numbers: diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp index 22c40dfef94..fa88a4987f8 100644 --- a/src/plugins/android/androidtoolmanager.cpp +++ b/src/plugins/android/androidtoolmanager.cpp @@ -206,8 +206,10 @@ AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::Fil if (avds.empty()) return devices; - while (avds.first().startsWith(QLatin1String("* daemon"))) - avds.removeFirst(); // remove the daemon logs + for (const QString line : avds) // remove the daemon logs + if (line.startsWith("* daemon")) + avds.removeOne(line); + avds.removeFirst(); // remove "List of devices attached" header line bool nextLineIsTargetLine = false; From 6b536bcbdf97d35f19a0ceaedd69d3b56665af84 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 30 Mar 2020 10:15:18 +0300 Subject: [PATCH 7/9] Android: silence assert in AndroidExtraLibraryListModel Change-Id: I57f2f8d6df3eb2b726b7056569d5e8f809e81177 Reviewed-by: hjk --- src/plugins/android/androidextralibrarylistmodel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androidextralibrarylistmodel.cpp b/src/plugins/android/androidextralibrarylistmodel.cpp index 58c6c2c8a78..3a168eca4a2 100644 --- a/src/plugins/android/androidextralibrarylistmodel.cpp +++ b/src/plugins/android/androidextralibrarylistmodel.cpp @@ -87,7 +87,8 @@ void AndroidExtraLibraryListModel::updateModel() QTC_ASSERT(rc, return); const ProjectNode *node = m_target->project()->findNodeForBuildKey(rc->buildKey()); - QTC_ASSERT(node, return); + if (!node) + return; if (node->parseInProgress()) { emit enabledChanged(false); From 709b57481e3803e980864006ee7cf1c555900936 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 18 May 2020 08:04:40 +0200 Subject: [PATCH 8/9] Mcu: Remove unused functions Last and only users are gone with f08fe165ab586e61. Change-Id: Id5ff577ce3d1c8c47269536eca2140c9340c5b03 Reviewed-by: Eike Ziller Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mcusupportsdk.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 757d919315b..fec1033d252 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -149,19 +149,6 @@ static McuPackage *createRGLPackage() return result; } -static McuPackage *createStm32CubeFwF7SdkPackage() -{ - auto result = new McuPackage( - McuPackage::tr("STM32Cube SDK"), - "%{Env:STM32Cube_FW_F7_SDK_PATH}", - "Drivers/STM32F7xx_HAL_Driver", - "Stm32CubeFwF7Sdk"); - result->setDownloadUrl( - "https://www.st.com/content/st_com/en/products/embedded-software/mcus-embedded-software/stm32-embedded-software/stm32cube-mcu-packages/stm32cubef7.html"); - result->setEnvironmentVariableName("STM32Cube_FW_F7_SDK_PATH"); - return result; -} - static McuPackage *createStm32CubeProgrammerPackage() { @@ -185,17 +172,6 @@ static McuPackage *createStm32CubeProgrammerPackage() return result; } -static McuPackage *createEvkbImxrt1050SdkPackage() -{ - auto result = new McuPackage( - McuPackage::tr("NXP i.MXRT SDK"), - "%{Env:EVKB_IMXRT1050_SDK_PATH}", // TODO: Try to not use 1050 specifics - "EVKB-IMXRT1050_manifest_v3_5.xml", - "EvkbImxrt1050Sdk"); - result->setDownloadUrl("https://mcuxpresso.nxp.com/en/welcome"); - return result; -} - static McuPackage *createMcuXpressoIdePackage() { const char envVar[] = "MCUXpressoIDE_PATH"; From cad625c739534e29157b20a59df0d8428b26a30e Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 18 May 2020 15:28:25 +0200 Subject: [PATCH 9/9] Squish: Remove pastecode.xyz from tests Service is unavailable. Task-number: QTCREATORBUG-24002 Change-Id: I012681ec1ec1deb30387e1762fe72a877e56fa10 Reviewed-by: Robert Loehning --- tests/system/suite_tools/tst_codepasting/test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index 42eb3ef8b0a..0915f02fcc2 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/tests/system/suite_tools/tst_codepasting/test.py @@ -35,7 +35,6 @@ def __platformToBeRunToday__(): skipPastingToPastebinCom = platform.system() not in __platformToBeRunToday__() NAME_PBCOM = "Pastebin.Com" -NAME_PCXYZ = "Pastecode.Xyz" serverProblems = "Server side problems." @@ -169,7 +168,7 @@ def main(): startQC() if not startedWithoutPluginError(): return - protocolsToTest = [NAME_PBCOM, NAME_PCXYZ] + protocolsToTest = [NAME_PBCOM] sourceFile = os.path.join(os.getcwd(), "testdata", "main.cpp") # make sure General Messages is open openGeneralMessages()