From 7740c31746efc7eabb74ed22802f8c88711a0aba Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 27 Sep 2015 15:42:16 +0300 Subject: [PATCH 1/4] Git: Increase delay for mergetool On Windows it takes more than 500ms to retrieve the first line. Really wait until we have an entire line then read. Change-Id: I9f7c222c314ea977179ed549281ef145ba756c73 Reviewed-by: Eike Ziller Reviewed-by: Tobias Hunger --- src/plugins/git/mergetool.cpp | 54 +++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index cc58e6ff07a..6bd665c9ed8 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -119,31 +119,35 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files) MergeTool::FileState MergeTool::waitAndReadStatus(QString &extraInfo) { QByteArray state; - if (m_process->canReadLine() || (m_process->waitForReadyRead(500) && m_process->canReadLine())) { - state = m_process->readLine().trimmed(); - // " {local}: modified file" - // " {remote}: deleted" - if (!state.isEmpty()) { - state = state.mid(state.indexOf(':') + 2); - if (state == "deleted") - return DeletedState; - if (state.startsWith("modified")) - return ModifiedState; - if (state.startsWith("created")) - return CreatedState; - QByteArray submodulePrefix("submodule commit "); - // " {local}: submodule commit " - if (state.startsWith(submodulePrefix)) { - extraInfo = QString::fromLocal8Bit(state.mid(submodulePrefix.size())); - return SubmoduleState; - } - // " {local}: a symbolic link -> 'foo.cpp'" - QByteArray symlinkPrefix("a symbolic link -> '"); - if (state.startsWith(symlinkPrefix)) { - extraInfo = QString::fromLocal8Bit(state.mid(symlinkPrefix.size())); - extraInfo.chop(1); // remove last quote - return SymbolicLinkState; - } + for (int i = 0; i < 5; ++i) { + if (m_process->canReadLine()) { + state = m_process->readLine().trimmed(); + break; + } + m_process->waitForReadyRead(500); + } + // " {local}: modified file" + // " {remote}: deleted" + if (!state.isEmpty()) { + state = state.mid(state.indexOf(':') + 2); + if (state == "deleted") + return DeletedState; + if (state.startsWith("modified")) + return ModifiedState; + if (state.startsWith("created")) + return CreatedState; + QByteArray submodulePrefix("submodule commit "); + // " {local}: submodule commit " + if (state.startsWith(submodulePrefix)) { + extraInfo = QString::fromLocal8Bit(state.mid(submodulePrefix.size())); + return SubmoduleState; + } + // " {local}: a symbolic link -> 'foo.cpp'" + QByteArray symlinkPrefix("a symbolic link -> '"); + if (state.startsWith(symlinkPrefix)) { + extraInfo = QString::fromLocal8Bit(state.mid(symlinkPrefix.size())); + extraInfo.chop(1); // remove last quote + return SymbolicLinkState; } } return UnknownState; From 47654d6d73c8fa18a918b06683020cfad4e6fd02 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 30 Sep 2015 15:38:30 +0200 Subject: [PATCH 2/4] UiCodeModelSupport: Fix crash when removing kit Change-Id: I30c5c9f2456e911d01376b1c06f2255a95080897 Task-number: QTCREATORBUG-15120 Reviewed-by: Tobias Hunger --- src/plugins/qtsupport/uicodemodelsupport.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/qtsupport/uicodemodelsupport.cpp b/src/plugins/qtsupport/uicodemodelsupport.cpp index 358784c1b97..590efafc56c 100644 --- a/src/plugins/qtsupport/uicodemodelsupport.cpp +++ b/src/plugins/qtsupport/uicodemodelsupport.cpp @@ -251,12 +251,12 @@ void UiCodeModelSupport::updateFromBuild() QString UiCodeModelSupport::uicCommand() const { QtSupport::BaseQtVersion *version; - if (m_project->needsConfiguration()) { - version = QtSupport::QtKitInformation::qtVersion(ProjectExplorer::KitManager::defaultKit()); - } else { - ProjectExplorer::Target *target = m_project->activeTarget(); + ProjectExplorer::Target *target; + if (!m_project->needsConfiguration() + && (target = m_project->activeTarget())) version = QtSupport::QtKitInformation::qtVersion(target->kit()); - } + else + version = QtSupport::QtKitInformation::qtVersion(ProjectExplorer::KitManager::defaultKit()); return version ? version->uicCommand() : QString(); } From bbc07bd47e17b36aec2769392356eca90bae1cfd Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 1 Oct 2015 16:25:22 +0200 Subject: [PATCH 3/4] iOS: Do not hardcode Qt version in iOS kits Since Qt installers nowadays (since Qt 5.3) register all Qt patch releases of the same minor version with the same ID, the Kit will not be updated (because the Qt 'is the same'), so it should use %{Qt:Version} instead of hardcoding the version. Change-Id: Ieb8b766490b3c6297fa11802c6e13724658795d5 Task-number: QTCREATORBUG-15128 Reviewed-by: Tobias Hunger --- src/plugins/ios/iosconfigurations.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 4c7b692587a..dbaca861b96 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -300,11 +300,28 @@ void IosConfigurations::updateAutomaticKitList() } if (kitExists) { kitAtt->blockNotification(); + // TODO: this is just to fix up broken display names from before + QString baseDisplayName = tr("%1 %2").arg(p.name, qt->unexpandedDisplayName()); + QString displayName = baseDisplayName; + for (int iVers = 1; iVers < 100; ++iVers) { + bool unique = true; + foreach (const Kit *k, existingKits) { + if (k == kitAtt) + continue; + if (k->displayName() == displayName) { + unique = false; + break; + } + } + if (unique) break; + displayName = baseDisplayName + QLatin1Char('-') + QString::number(iVers); + } + kitAtt->setUnexpandedDisplayName(displayName); } else { qCDebug(kitSetupLog) << "setting up new kit for " << p.name; kitAtt = new Kit; kitAtt->setAutoDetected(true); - QString baseDisplayName = tr("%1 %2").arg(p.name, qt->displayName()); + QString baseDisplayName = tr("%1 %2").arg(p.name, qt->unexpandedDisplayName()); QString displayName = baseDisplayName; for (int iVers = 1; iVers < 100; ++iVers) { bool unique = true; From e548635a24b93d17ae7cc8fd8d0b6c4ac95ee1f6 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 2 Oct 2015 15:44:00 +0200 Subject: [PATCH 4/4] Update qbs submodule. To HEAD of 1.4 branch. Change-Id: I53e4f472e04e87520fb5be0c64030090e64e8a6b Reviewed-by: Joerg Bornemann --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 31881df00d0..55ff3783ce2 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 31881df00d0321f54b8f0d1865d8b16847befde0 +Subproject commit 55ff3783ce27c87517ae4758fdaca0f16a86367b