();
- m_nonOverrideWarning->setToolTip("" +
+ m_nonOverrideWarning->setText("
" +
tr("MAKEFLAGS specifies parallel jobs. Check \"%1\" to override.")
.arg(text) + "
");
m_nonOverrideWarning->setIconType(InfoLabel::Warning);
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index a77b24bc059..8a598c2624a 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -2085,23 +2085,21 @@ std::optional MsvcToolChain::generateEnvironmentSettings(const Utils::E
// Create a batch file to create and save the env settings
Utils::TempFileSaver saver(Utils::TemporaryDirectory::masterDirectoryPath() + "/XXXXXX.bat");
- auto makeCall = [](const QString &batchFile, const QString &batchArgs) -> QByteArray {
- QByteArray call = "call ";
- call += ProcessArgs::quoteArg(batchFile).toLocal8Bit();
- if (!batchArgs.isEmpty()) {
- call += ' ';
- call += batchArgs.toLocal8Bit();
- }
- return call;
- };
- QByteArray callCleanEnv = makeCall(batchFile, "/clean_env");
- QByteArray call = makeCall(batchFile, batchArgs);
+ QByteArray call = "call ";
+ call += ProcessArgs::quoteArg(batchFile).toLocal8Bit();
+ if (!batchArgs.isEmpty()) {
+ call += ' ';
+ call += batchArgs.toLocal8Bit();
+ }
if (Utils::HostOsInfo::isWindowsHost())
saver.write("chcp 65001\r\n");
saver.write("set VSCMD_SKIP_SENDTELEMETRY=1\r\n");
saver.write("set CLINK_NOAUTORUN=1\r\n");
- saver.write(callCleanEnv + "\r\n");
+ saver.write("setlocal enableextensions\r\n");
+ saver.write("if defined VCINSTALLDIR (\r\n");
+ saver.write(" call \"%VCINSTALLDIR%/Auxiliary/Build/vcvarsall.bat\" /clean_env\r\n");
+ saver.write(")\r\n");
saver.write(call + "\r\n");
saver.write("@echo " + marker.toLocal8Bit() + "\r\n");
saver.write("set\r\n");
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
index 5684580d71a..570c44e67b7 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
@@ -107,7 +107,6 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget(QWidget *parent) :
m_terminalModeComboBox->addItem(tr("Deduced from Project"));
m_terminalModeComboBox->setSizePolicy(cbSizePolicy);
m_jomCheckbox = new QCheckBox(tr("Use jom instead of nmake"));
- m_jomCheckbox->setVisible(HostOsInfo::isWindowsHost());
auto jomLabel = new QLabel("jom is a drop-in replacement for nmake which "
"distributes the compilation process to multiple CPU cores. "
"The latest binary is available at "
@@ -115,7 +114,6 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget(QWidget *parent) :
"http://download.qt.io/official_releases/jom/. "
"Disable it if you experience problems with your builds.");
jomLabel->setWordWrap(true);
- jomLabel->setVisible(HostOsInfo::isWindowsHost());
using namespace Utils::Layouting;
Column {
@@ -155,6 +153,9 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget(QWidget *parent) :
st,
}.attachTo(this);
+ m_jomCheckbox->setVisible(HostOsInfo::isWindowsHost());
+ jomLabel->setVisible(HostOsInfo::isWindowsHost());
+
m_directoryButtonGroup = new QButtonGroup;
m_directoryButtonGroup->setExclusive(true);
m_directoryButtonGroup->addButton(m_currentDirectoryRadioButton, UseCurrentDirectory);
diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp
index 285836cab39..568247f7e2c 100644
--- a/src/plugins/projectexplorer/sessiondialog.cpp
+++ b/src/plugins/projectexplorer/sessiondialog.cpp
@@ -109,17 +109,21 @@ bool SessionNameInputDialog::isSwitchToRequested() const
SessionDialog::SessionDialog(QWidget *parent) : QDialog(parent)
{
+ setObjectName("ProjectExplorer.SessionDialog");
resize(550, 400);
setWindowTitle(tr("Session Manager"));
auto sessionView = new SessionView(this);
+ sessionView->setObjectName("sessionView");
sessionView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
sessionView->setActivationMode(Utils::DoubleClickActivation);
auto createNewButton = new QPushButton(tr("&New"));
+ createNewButton->setObjectName("btCreateNew");
m_openButton = new QPushButton(tr("&Open"));
+ m_openButton->setObjectName("btOpen");
m_renameButton = new QPushButton(tr("&Rename"));
m_cloneButton = new QPushButton(tr("C&lone"));
m_deleteButton = new QPushButton(tr("&Delete"));
diff --git a/src/plugins/python/pysidebuildconfiguration.cpp b/src/plugins/python/pysidebuildconfiguration.cpp
index 13367f55d9e..6faa194b0bf 100644
--- a/src/plugins/python/pysidebuildconfiguration.cpp
+++ b/src/plugins/python/pysidebuildconfiguration.cpp
@@ -62,7 +62,9 @@ PySideBuildStep::PySideBuildStep(BuildStepList *bsl, Id id)
m_pysideProject->setFilePath(pySideProjectPath);
setCommandLineProvider([this] { return CommandLine(m_pysideProject->filePath(), {"build"}); });
- setWorkingDirectoryProvider([this] { return target()->project()->projectDirectory(); });
+ setWorkingDirectoryProvider([this] {
+ return target()->project()->projectDirectory().onDevice(m_pysideProject->filePath());
+ });
setEnvironmentModifier([this](Environment &env) {
env.prependOrSetPath(m_pysideProject->filePath().parentDir());
});
diff --git a/src/plugins/python/pythonproject.cpp b/src/plugins/python/pythonproject.cpp
index 70528b0c997..a255c5ab5c2 100644
--- a/src/plugins/python/pythonproject.cpp
+++ b/src/plugins/python/pythonproject.cpp
@@ -476,7 +476,7 @@ PythonBuildSystem::PythonBuildSystem(Target *target)
: BuildSystem(target)
{
connect(target->project(), &Project::projectFileIsDirty, this, [this] { triggerParsing(); });
- QTimer::singleShot(0, this, &PythonBuildSystem::triggerParsing);
+ triggerParsing();
}
bool PythonBuildSystem::supportsAction(Node *context, ProjectAction action, const Node *node) const
diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp
index 7a370f7517e..28937e0813b 100644
--- a/src/plugins/python/pythonrunconfiguration.cpp
+++ b/src/plugins/python/pythonrunconfiguration.cpp
@@ -20,6 +20,8 @@
#include
#include
+#include
+#include
#include