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

Qnx: Mark new kits from setup dialog as not autodetected

Browse Source 
It's more flexible for the user to have them modifiable.
Tendency nowadays is to only have SDK-provided kits (or possibly
everything that also 'goes away byitself' marked autodetected.

Change-Id: I0098196320abe73998c38e9944fcb89554e36bb7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-02-22 11:45:46 +01:00
parent ca8d4082ec
commit 4de07bf444
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/qnxconfiguration.cpp
View File

@@ -283,7 +283,7 @@ void QnxConfiguration::createKit(const Target &target, const QnxToolChainMap &to
.arg(displayName()) .arg(displayName())
.arg(target.shortDescription())); .arg(target.shortDescription()));
k->setAutoDetected(true); k->setAutoDetected(false);
k->setAutoDetectionSource(envFile().toString()); k->setAutoDetectionSource(envFile().toString());
k->setMutable(DeviceKitAspect::id(), true); k->setMutable(DeviceKitAspect::id(), true);

1
src/plugins/qnx/qnxconfigurationmanager.cpp
View File

@@ -29,7 +29,6 @@ QnxConfigurationManager::QnxConfigurationManager()
{ {
m_instance = this; m_instance = this;
m_writer = new PersistentSettingsWriter(qnxConfigSettingsFileName(), "QnxConfigurations"); m_writer = new PersistentSettingsWriter(qnxConfigSettingsFileName(), "QnxConfigurations");
restoreConfigurations();
connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested, connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested,
this, &QnxConfigurationManager::saveConfigs); this, &QnxConfigurationManager::saveConfigs);
} }

3
src/plugins/qnx/qnxconfigurationmanager.h
View File

@@ -19,6 +19,8 @@ public:
QnxConfigurationManager(); QnxConfigurationManager();
~QnxConfigurationManager() override; ~QnxConfigurationManager() override;
void restoreConfigurations();
static QnxConfigurationManager *instance(); static QnxConfigurationManager *instance();
QList<QnxConfiguration*> configurations() const; QList<QnxConfiguration*> configurations() const;
void removeConfiguration(QnxConfiguration *config); void removeConfiguration(QnxConfiguration *config);
@@ -34,7 +36,6 @@ signals:
private: private:
QList<QnxConfiguration*> m_configurations; QList<QnxConfiguration*> m_configurations;
Utils::PersistentSettingsWriter *m_writer; Utils::PersistentSettingsWriter *m_writer;
void restoreConfigurations();
}; };
} // Qnx::Internal } // Qnx::Internal

5
src/plugins/qnx/qnxplugin.cpp
View File

@@ -90,7 +90,7 @@ public:
QAction *m_debugSeparator = nullptr; QAction *m_debugSeparator = nullptr;
QAction m_attachToQnxApplication{Tr::tr("Attach to remote QNX application..."), nullptr}; QAction m_attachToQnxApplication{Tr::tr("Attach to remote QNX application..."), nullptr};
QnxConfigurationManager configurationFactory; QnxConfigurationManager configurationManager;
QnxQtVersionFactory qtVersionFactory; QnxQtVersionFactory qtVersionFactory;
QnxDeviceFactory deviceFactory; QnxDeviceFactory deviceFactory;
QnxDeployConfigurationFactory deployConfigFactory; QnxDeployConfigurationFactory deployConfigFactory;
@@ -122,6 +122,9 @@ private:
void QnxPlugin::extensionsInitialized() void QnxPlugin::extensionsInitialized()
{ {
// Can't do in init as not all devices are around.
d->configurationManager.restoreConfigurations();
// Attach support // Attach support
connect(&d->m_attachToQnxApplication, &QAction::triggered, this, &showAttachToProcessDialog); connect(&d->m_attachToQnxApplication, &QAction::triggered, this, &showAttachToProcessDialog);