summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qtversionmanager.h
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2011-03-30 15:47:51 +0200
committerTobias Hunger <tobias.hunger@nokia.com>2011-03-30 16:04:51 +0200
commitf8d7be70bcb070b0a3184eb593196ba7df9def28 (patch)
tree12f0ea97c5b60e260471022b97e39c75043c5b9f /src/plugins/qt4projectmanager/qtversionmanager.h
parentc688a39b915f991d08e5dcb00009359b00737090 (diff)
downloadqt-creator-f8d7be70bcb070b0a3184eb593196ba7df9def28.tar.gz
Fix update from GCCE and WINSCW set in Qt version
Fix the upgrade from GCCE and WINSCW from Qt version to tool chain. Task-number: QTCREATORBUG-4204 Reviewed-by: dt
Diffstat (limited to 'src/plugins/qt4projectmanager/qtversionmanager.h')
-rw-r--r--src/plugins/qt4projectmanager/qtversionmanager.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index b5cb913360..dbc4b003aa 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -294,6 +294,10 @@ public:
static QString findQMakeBinaryFromMakefile(const QString &directory);
bool isValidId(int id) const;
+ // Compatibility with pre-2.2:
+ QString popPendingMwcUpdate();
+ QString popPendingGcceUpdate();
+
signals:
void qtVersionsChanged(const QList<int> &uniqueIds);
void updateExamples(QString, QString, QString);
@@ -328,6 +332,10 @@ private:
int m_idcount;
// managed by QtProjectManagerPlugin
static QtVersionManager *m_self;
+
+ // Compatibility with pre-2.2:
+ QStringList m_pendingMwcUpdates;
+ QStringList m_pendingGcceUpdates;
};
} // namespace Qt4ProjectManager