diff options
| author | kh1 <qt-info@nokia.com> | 2011-05-16 20:49:49 +0200 |
|---|---|---|
| committer | kh1 <qt-info@nokia.com> | 2011-05-16 20:49:49 +0200 |
| commit | 44cff55378c5a680457e2c804fa51eee4c82e3fd (patch) | |
| tree | b48989ede66707650dc723e3483877546ec698e1 /installerbuilder/libinstaller/libinstaller.pro | |
| parent | 367477f07449f25cdfbd2c1d4274df698f279a21 (diff) | |
| parent | 6391f4a773c66b768f70133e628544db0af67a58 (diff) | |
Merge branch 'master' into refactor
Conflicts:
installerbuilder/libinstaller/libinstaller.pri
installerbuilder/libinstaller/libinstaller.pro
installerbuilder/libinstaller/registertoolchainoperation.cpp
Diffstat (limited to 'installerbuilder/libinstaller/libinstaller.pro')
| -rw-r--r-- | installerbuilder/libinstaller/libinstaller.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro index bd53ab6e1..4d0183ede 100644 --- a/installerbuilder/libinstaller/libinstaller.pro +++ b/installerbuilder/libinstaller/libinstaller.pro @@ -92,6 +92,9 @@ HEADERS += $$PWD/qinstaller.h \ licenseoperation.h \ qinstallercomponent_p.h \ qtcreator_constants.h \ + qtcreatorpersistentsettings.h \ + registerdefaultdebuggeroperation.h \ + updatecreatorsettingsfrom21to22operation.h \ qprocesswrapper.h SOURCES += $$PWD/qinstaller.cpp \ @@ -151,6 +154,9 @@ SOURCES += $$PWD/qinstaller.cpp \ getrepositoriesmetainfojob.cpp \ licenseoperation.cpp \ qinstallercomponent_p.cpp \ + qtcreatorpersistentsettings.cpp \ + registerdefaultdebuggeroperation.cpp \ + updatecreatorsettingsfrom21to22operation.cpp \ qprocesswrapper.cpp macx { |