Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2020-05-05 19:01:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old) and /work/SRC/openSUSE:Factory/.libqt5-creator.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-creator" Tue May 5 19:01:14 2020 rev:77 rq:800281 version:4.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes 2020-05-01 11:15:19.212104109 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new.2738/libqt5-creator.changes 2020-05-05 19:03:36.946466449 +0200 @@ -1,0 +2,6 @@ +Tue May 5 07:31:36 UTC 2020 - Fabian Vogt <[email protected]> + +- Add patch to fix crash on startup (boo#1170872, QTCREATORBUG-23963): + * android-guard-against-kits-without-qt-version.patch + +------------------------------------------------------------------- New: ---- android-guard-against-kits-without-qt-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-creator.spec ++++++ --- /var/tmp/diff_new_pack.EdYdIY/_old 2020-05-05 19:03:50.694494878 +0200 +++ /var/tmp/diff_new_pack.EdYdIY/_new 2020-05-05 19:03:50.698494885 +0200 @@ -45,6 +45,8 @@ Patch0: 0001-Fix-build-with-openSUSE-clang9-package.patch # PATCH-FIX-OPENSUSE Patch1: fix-application-output.patch +# PATCH-FIX-UPSTREAM +Patch2: android-guard-against-kits-without-qt-version.patch BuildRequires: gdb BuildRequires: libQt5Sql5-sqlite >= %{qt5_version} BuildRequires: libbotan-devel ++++++ android-guard-against-kits-without-qt-version.patch ++++++ >From d10f6a031a564cb640309bf1fe5180f1d6d3f03f Mon Sep 17 00:00:00 2001 From: hjk <[email protected]> Date: Thu, 30 Apr 2020 16:41:39 +0200 Subject: [PATCH] Android: Guard against kits without Qt version ... in AndroidConfigurations::updateAutomaticKitList. Also, simplify code a bit. Task-number: QTCREATORBUG-23963 Change-Id: I6835721ec8b89dec57d668393178427ffa03ff6d Reviewed-by: Eike Ziller <[email protected]> Reviewed-by: Assam Boudjelthia <[email protected]> --- src/plugins/android/androidconfigurations.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index a574c4c1239..f5ce84007ed 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1324,15 +1324,14 @@ static QVariant findOrRegisterDebugger(ToolChain *tc, void AndroidConfigurations::updateAutomaticKitList() { - const QList<Kit *> androidKits = Utils::filtered(KitManager::kits(), [](Kit *k) { - Core::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(k); - return deviceTypeId == Core::Id(Constants::ANDROID_DEVICE_TYPE); - }); - - for (auto k: androidKits) { - if (k->value(Constants::ANDROID_KIT_NDK).isNull() || k->value(Constants::ANDROID_KIT_SDK).isNull()) { - k->setValueSilently(Constants::ANDROID_KIT_NDK, currentConfig().ndkLocation(QtSupport::QtKitAspect::qtVersion(k)).toString()); - k->setValue(Constants::ANDROID_KIT_SDK, currentConfig().sdkLocation().toString()); + for (Kit *k : KitManager::kits()) { + if (DeviceTypeKitAspect::deviceTypeId(k) == Constants::ANDROID_DEVICE_TYPE) { + if (k->value(Constants::ANDROID_KIT_NDK).isNull() || k->value(Constants::ANDROID_KIT_SDK).isNull()) { + if (BaseQtVersion *qt = QtKitAspect::qtVersion(k)) { + k->setValueSilently(Constants::ANDROID_KIT_NDK, currentConfig().ndkLocation(qt).toString()); + k->setValue(Constants::ANDROID_KIT_SDK, currentConfig().sdkLocation().toString()); + } + } } }
