feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	src/libs/utils/pathchooser.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I7ae3f91618c4a4ccb088679caea72b2a81590960
This commit is contained in:
Eike Ziller
2023-01-13 09:16:25 +01:00
parent ccff024a66 1b6d434c9c
commit 2688a9629c
9 changed files with 224 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/pathchooser.cpp
View File

@@ -6,6 +6,7 @@
#include "commandline.h"
#include "environment.h"
#include "fileutils.h"
#include "guard.h"
#include "hostosinfo.h"
#include "macroexpander.h"
#include "optionpushbutton.h"
@@ -179,6 +180,7 @@ public:
QMenu *m_contextMenu = nullptr;
OptionPushButton *m_browseButton = nullptr;
Guard m_callGuard;
};
PathChooserPrivate::PathChooserPrivate()
@@ -368,11 +370,15 @@ QString PathChooser::expandedDirectory(const QString &input, const Environment &
void PathChooser::setPath(const QString &path)
{
QTC_ASSERT(!d->m_callGuard.isLocked(), return);
GuardLocker locker(d->m_callGuard);
d->m_lineEdit->setTextKeepingActiveCursor(QDir::toNativeSeparators(path));
}
void PathChooser::setFilePath(const FilePath &fn)
{
QTC_ASSERT(!d->m_callGuard.isLocked(), return);
GuardLocker locker(d->m_callGuard);
d->m_lineEdit->setTextKeepingActiveCursor(fn.toUserOutput());
}