diff options
| author | Tim Jenssen <[email protected]> | 2023-10-05 15:01:35 +0200 |
|---|---|---|
| committer | Tim Jenssen <[email protected]> | 2023-10-05 15:53:42 +0200 |
| commit | 85ea2758ac063174c8d62b51dbfbfee9291d65c4 (patch) | |
| tree | 33427a0cf8858ec82bb6a1c4aed05e8a4b85660f /src/plugins/qmlprojectmanager/qmlprojectplugin.cpp | |
| parent | 257af1ebd80e0c0b9ac2e4104c6aea5c4d9e6281 (diff) | |
| parent | 97ca8cc2700fb606fdcc1e3f089e904e6d308aba (diff) | |
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
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectplugin.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 7c12e312b10..24fd05a5540 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -266,7 +266,7 @@ void QmlProjectPlugin::initialize() Utils::FileIconProvider::registerIconOverlayForSuffix(":/qmlproject/images/qmlproject.png", "qmlproject"); - if (QmlProject::isQtDesignStudio()) { + if (Core::ICore::isQtDesignStudio()) { Core::ActionContainer *menu = Core::ActionManager::actionContainer( ProjectExplorer::Constants::M_FILECONTEXT); QAction *mainfileAction = new QAction(Tr::tr("Set as Main .qml File"), this); @@ -355,7 +355,7 @@ void QmlProjectPlugin::initialize() } GenerateCmake::generateMenuEntry(this); - if (QmlProject::isQtDesignStudio()) + if (Core::ICore::isQtDesignStudio()) GenerateCmake::CmakeProjectConverter::generateMenuEntry(this); } |