diff options
| author | kh1 <qt-info@nokia.com> | 2011-05-12 14:57:32 +0200 |
|---|---|---|
| committer | kh1 <qt-info@nokia.com> | 2011-05-12 14:57:32 +0200 |
| commit | 335911e45db8d3c887c0e759b721db1d74e41f99 (patch) | |
| tree | 8f6b7acb638297a3626304fd1a8c155145f998ea /installerbuilder/libinstaller/libinstaller.pro | |
| parent | 007d2517bc4931cf69ae55677034ec87a2843a8c (diff) | |
| parent | 83fb4bc8b2573765a47ef6c5eb7058e17a7415e4 (diff) | |
Merge branch 'master' into refactor
Conflicts:
installerbuilder/libinstaller/elevatedexecuteoperation.cpp
installerbuilder/libinstaller/installiconsoperation.cpp
installerbuilder/libinstaller/libinstaller.pro
installerbuilder/libinstaller/qinstaller.cpp
installerbuilder/libinstaller/registertoolchainoperation.cpp
installerbuilder/libinstaller/selfrestartoperation.cpp
Diffstat (limited to 'installerbuilder/libinstaller/libinstaller.pro')
| -rw-r--r-- | installerbuilder/libinstaller/libinstaller.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro index 3b9dccfd1..6d9c00681 100644 --- a/installerbuilder/libinstaller/libinstaller.pro +++ b/installerbuilder/libinstaller/libinstaller.pro @@ -90,7 +90,8 @@ HEADERS += $$PWD/qinstaller.h \ messageboxhandler.h \ getrepositoriesmetainfojob.h \ licenseoperation.h \ - qinstallercomponent_p.h + qinstallercomponent_p.h \ + qtcreator_constants.h SOURCES += $$PWD/qinstaller.cpp \ $$PWD/qinstaller_p.cpp \ |