diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt new file mode 100644 index 0000000000000000000000000000000000000000..9db7c47f8b9689e92cccaa32e3c9fc6bf47bf439 --- /dev/null +++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt @@ -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 diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri index 2d2d68a3cc2cd9a0eeab5a05d74b55c9c8bc12f8..796ef759da3edefb8a5eb02705fcb8a59c4b8e8e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri +++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri @@ -11,5 +11,5 @@ SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60) $$PWD/s60devicespreferencepane.h \ $$PWD/s60manager.h - FORMS += $$PWD/s60devicespreferencepane.ui + OTHER_FILES += qt-s60-todo.txt } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp index fb785b1ea66440189800e665e3ea45b3b85c7bdb..98be1f68b6a36be4bf2dd9fa0540a9396915024f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp @@ -115,6 +115,7 @@ bool S60Devices::detectQtForDevices() } qtDll.close(); } + emit qtVersionsChanged(); return true; } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devices.h b/src/plugins/qt4projectmanager/qt-s60/s60devices.h index 0d6644b00cd62d87b1ce54829877bacbf5aad506..ae991b4e845f93e48c3c2bcbd06f918df976a496 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devices.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devices.h @@ -27,6 +27,10 @@ public: QList<Device> devices() const; bool detectQtForDevices(); Device deviceForRoot(const QString &epocRoot) const; + +signals: + void qtVersionsChanged(); + private: QString m_errorString; QList<Device> m_devices; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp index ed0f9e40c562285d9945301042e7355c2abdb7e1..f58d69b6f606e38cfd96bd6d134449f377ce14f2 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp @@ -50,6 +50,8 @@ S60Manager::S60Manager(QObject *parent) ExtensionSystem::PluginManager::instance() ->addObject(m_devicesPreferencePane); updateQtVersions(); + connect(m_devices, SIGNAL(qtVersionsChanged()), + this, SLOT(updateQtVersions())); } S60Manager::~S60Manager() diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.h b/src/plugins/qt4projectmanager/qt-s60/s60manager.h index 2b34c0446590ee9c4b2012a68449e404af88af1b..c9b4f7588468434762ce4cc6d7de09a2c5f33273 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60manager.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.h @@ -46,6 +46,8 @@ class S60Manager : public QObject public: S60Manager(QObject *parent = 0); ~S60Manager(); + +private slots: void updateQtVersions(); private: