diff options
| author | dt <qtc-committer@nokia.com> | 2011-05-04 13:14:46 +0200 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2011-05-12 12:23:06 +0200 |
| commit | 8e171e0be0239c18843fc65784cb91120b252c8f (patch) | |
| tree | 06900feae14b15b3897fff193cf36dbd44bad8b3 /src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp | |
| parent | 9ef4ea40f27befa4b5b553c3dfa94d979a34748c (diff) | |
| download | qt-creator-8e171e0be0239c18843fc65784cb91120b252c8f.tar.gz | |
Qt Version refactoring
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.
Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.
Completly change the qt in path autodetection to be only
a fall back if no configuration was found.
Note: For now the old settings are not removed, as such 2.2 and master
can coexist.
Reviewed-By: hunger
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp index 4118f76cc2..dca47e6cab 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp @@ -248,6 +248,8 @@ bool S60PublisherOvi::isVendorNameValid(const QString &vendorName) const QString S60PublisherOvi::qtVersion() const { + if (!m_qt4bc->qtVersion()) + return QString(); return m_qt4bc->qtVersion()->displayName(); } |