forked from qt-creator/qt-creator
Update Qt versions when refresh button is pressed.
At the moment you need to close and reopen the preferences dialog though.
This commit is contained in:
3
src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
Normal file
3
src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
* When the refresh button in the SDK option page is pressed
|
||||||
|
the qtoptionspage is not updated to reflect the new versions
|
||||||
|
though we update them in S60Manager
|
||||||
@@ -11,5 +11,5 @@ SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
|
|||||||
$$PWD/s60devicespreferencepane.h \
|
$$PWD/s60devicespreferencepane.h \
|
||||||
$$PWD/s60manager.h
|
$$PWD/s60manager.h
|
||||||
|
|
||||||
FORMS += $$PWD/s60devicespreferencepane.ui
|
OTHER_FILES += qt-s60-todo.txt
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,6 +115,7 @@ bool S60Devices::detectQtForDevices()
|
|||||||
}
|
}
|
||||||
qtDll.close();
|
qtDll.close();
|
||||||
}
|
}
|
||||||
|
emit qtVersionsChanged();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,10 @@ public:
|
|||||||
QList<Device> devices() const;
|
QList<Device> devices() const;
|
||||||
bool detectQtForDevices();
|
bool detectQtForDevices();
|
||||||
Device deviceForRoot(const QString &epocRoot) const;
|
Device deviceForRoot(const QString &epocRoot) const;
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void qtVersionsChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString m_errorString;
|
QString m_errorString;
|
||||||
QList<Device> m_devices;
|
QList<Device> m_devices;
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ S60Manager::S60Manager(QObject *parent)
|
|||||||
ExtensionSystem::PluginManager::instance()
|
ExtensionSystem::PluginManager::instance()
|
||||||
->addObject(m_devicesPreferencePane);
|
->addObject(m_devicesPreferencePane);
|
||||||
updateQtVersions();
|
updateQtVersions();
|
||||||
|
connect(m_devices, SIGNAL(qtVersionsChanged()),
|
||||||
|
this, SLOT(updateQtVersions()));
|
||||||
}
|
}
|
||||||
|
|
||||||
S60Manager::~S60Manager()
|
S60Manager::~S60Manager()
|
||||||
|
|||||||
@@ -46,6 +46,8 @@ class S60Manager : public QObject
|
|||||||
public:
|
public:
|
||||||
S60Manager(QObject *parent = 0);
|
S60Manager(QObject *parent = 0);
|
||||||
~S60Manager();
|
~S60Manager();
|
||||||
|
|
||||||
|
private slots:
|
||||||
void updateQtVersions();
|
void updateQtVersions();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
Reference in New Issue
Block a user