OSDN Git Service

Qt Version refactoring
authordt <qtc-committer@nokia.com>
Wed, 4 May 2011 11:14:46 +0000 (13:14 +0200)
committerdt <qtc-committer@nokia.com>
Thu, 12 May 2011 10:23:06 +0000 (12:23 +0200)
commit8e171e0be0239c18843fc65784cb91120b252c8f
tree06900feae14b15b3897fff193cf36dbd44bad8b3
parent9ef4ea40f27befa4b5b553c3dfa94d979a34748c
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
104 files changed:
src/plugins/projectexplorer/buildconfiguration.cpp
src/plugins/projectexplorer/headerpath.h
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
src/plugins/qt4projectmanager/baseqtversion.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/baseqtversion.h [new file with mode: 0644]
src/plugins/qt4projectmanager/buildconfigurationinfo.h
src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp
src/plugins/qt4projectmanager/debugginghelperbuildtask.h
src/plugins/qt4projectmanager/externaleditors.cpp
src/plugins/qt4projectmanager/externaleditors.h
src/plugins/qt4projectmanager/makestep.cpp
src/plugins/qt4projectmanager/qmakestep.cpp
src/plugins/qt4projectmanager/qmldebugginglibrary.cpp
src/plugins/qt4projectmanager/qmldebugginglibrary.h
src/plugins/qt4projectmanager/qmldumptool.cpp
src/plugins/qt4projectmanager/qmldumptool.h
src/plugins/qt4projectmanager/qmlobservertool.cpp
src/plugins/qt4projectmanager/qmlobservertool.h
src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-desktop/desktopqtversionfactory.h [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-desktop/qt-desktop.pri
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-desktop/simulatorqtversionfactory.h [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h
src/plugins/qt4projectmanager/qt-maemo/maemodeployconfigurationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
src/plugins/qt4projectmanager/qt-maemo/maemoinstalltosysrootstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
src/plugins/qt4projectmanager/qt-maemo/maemomanager.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopublishingwizardfactories.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.h
src/plugins/qt4projectmanager/qt-maemo/maemoqtversion.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-maemo/maemoqtversion.h [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-maemo/maemoqtversionfactory.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-maemo/maemoqtversionfactory.h [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp
src/plugins/qt4projectmanager/qt-s60/s60runcontrolbase.cpp
src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-s60/symbianqtversion.h [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/qt-s60/symbianqtversionfactory.h [new file with mode: 0644]
src/plugins/qt4projectmanager/qt4basetargetfactory.h
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.h
src/plugins/qt4projectmanager/qt4nodes.cpp
src/plugins/qt4projectmanager/qt4project.cpp
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
src/plugins/qt4projectmanager/qt4projectmanager.cpp
src/plugins/qt4projectmanager/qt4projectmanager.pro
src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.cpp
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
src/plugins/qt4projectmanager/qtversionfactory.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/qtversionfactory.h [new file with mode: 0644]
src/plugins/qt4projectmanager/qtversioninfo.ui
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/qt4projectmanager/qtversionmanager.h
src/plugins/qt4projectmanager/winceqtversion.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/winceqtversion.h [new file with mode: 0644]
src/plugins/qt4projectmanager/winceqtversionfactory.cpp [new file with mode: 0644]
src/plugins/qt4projectmanager/winceqtversionfactory.h [new file with mode: 0644]
src/plugins/qt4projectmanager/wizards/qtwizard.cpp
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp