forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/qds/dev' into 12.0
Conflicts: share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml share/qtcreator/themes/dark.creatortheme share/qtcreator/themes/default.creatortheme share/qtcreator/themes/flat-dark.creatortheme share/qtcreator/themes/flat-light.creatortheme share/qtcreator/themes/flat.creatortheme src/libs/utils/CMakeLists.txt src/plugins/CMakeLists.txt src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
This commit is contained in:
@@ -543,6 +543,12 @@ bool ICore::showWarningWithOptions(const QString &title, const QString &text,
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ICore::isQtDesignStudio()
|
||||
{
|
||||
QtcSettings *settings = Core::ICore::settings();
|
||||
return settings->value("QML/Designer/StandAloneMode", false).toBool();
|
||||
}
|
||||
|
||||
/*!
|
||||
Returns the application's main settings object.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user