forked from qt-creator/qt-creator
Qnx: Mark new kits from setup dialog as not autodetected
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:
@@ -283,7 +283,7 @@ void QnxConfiguration::createKit(const Target &target, const QnxToolChainMap &to
|
||||
.arg(displayName())
|
||||
.arg(target.shortDescription()));
|
||||
|
||||
k->setAutoDetected(true);
|
||||
k->setAutoDetected(false);
|
||||
k->setAutoDetectionSource(envFile().toString());
|
||||
k->setMutable(DeviceKitAspect::id(), true);
|
||||
|
||||
|
@@ -29,7 +29,6 @@ QnxConfigurationManager::QnxConfigurationManager()
|
||||
{
|
||||
m_instance = this;
|
||||
m_writer = new PersistentSettingsWriter(qnxConfigSettingsFileName(), "QnxConfigurations");
|
||||
restoreConfigurations();
|
||||
connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested,
|
||||
this, &QnxConfigurationManager::saveConfigs);
|
||||
}
|
||||
|
@@ -19,6 +19,8 @@ public:
|
||||
QnxConfigurationManager();
|
||||
~QnxConfigurationManager() override;
|
||||
|
||||
void restoreConfigurations();
|
||||
|
||||
static QnxConfigurationManager *instance();
|
||||
QList<QnxConfiguration*> configurations() const;
|
||||
void removeConfiguration(QnxConfiguration *config);
|
||||
@@ -34,7 +36,6 @@ signals:
|
||||
private:
|
||||
QList<QnxConfiguration*> m_configurations;
|
||||
Utils::PersistentSettingsWriter *m_writer;
|
||||
void restoreConfigurations();
|
||||
};
|
||||
|
||||
} // Qnx::Internal
|
||||
|
@@ -90,7 +90,7 @@ public:
|
||||
QAction *m_debugSeparator = nullptr;
|
||||
QAction m_attachToQnxApplication{Tr::tr("Attach to remote QNX application..."), nullptr};
|
||||
|
||||
QnxConfigurationManager configurationFactory;
|
||||
QnxConfigurationManager configurationManager;
|
||||
QnxQtVersionFactory qtVersionFactory;
|
||||
QnxDeviceFactory deviceFactory;
|
||||
QnxDeployConfigurationFactory deployConfigFactory;
|
||||
@@ -122,6 +122,9 @@ private:
|
||||
|
||||
void QnxPlugin::extensionsInitialized()
|
||||
{
|
||||
// Can't do in init as not all devices are around.
|
||||
d->configurationManager.restoreConfigurations();
|
||||
|
||||
// Attach support
|
||||
connect(&d->m_attachToQnxApplication, &QAction::triggered, this, &showAttachToProcessDialog);
|
||||
|
||||
|
Reference in New Issue
Block a user