diff options
| author | kh1 <qt-info@nokia.com> | 2011-03-30 15:18:21 +0200 |
|---|---|---|
| committer | kh1 <qt-info@nokia.com> | 2011-03-30 15:18:21 +0200 |
| commit | 5fb9e4cd8488e67315df18fad585dedf3aeb9be8 (patch) | |
| tree | ee98c73d6e91a5498ef8dd3fc8e8f1085b30ba70 /installerbuilder/libinstaller/libinstaller.pro | |
| parent | a5507f265067a1268b29a204bf356d1951dc3be6 (diff) | |
| parent | ca229bc660b7367c94022aea8fa8fc7b4c5b38dd (diff) | |
Merge branch 'master' into refactor
Conflicts:
examples/testapp/testapp.pro
installerbuilder/installerbase/installerbasecommons.cpp
installerbuilder/libinstaller/qinstaller.cpp
installerbuilder/tests/tests.pro
Diffstat (limited to 'installerbuilder/libinstaller/libinstaller.pro')
| -rw-r--r-- | installerbuilder/libinstaller/libinstaller.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro index 21a55dea0..04832f902 100644 --- a/installerbuilder/libinstaller/libinstaller.pro +++ b/installerbuilder/libinstaller/libinstaller.pro @@ -48,6 +48,8 @@ HEADERS += $$PWD/qinstaller.h \ qinstallercomponentmodel.h \ qinstallerglobal.h \ qtpatch.h \ + persistentsettings.h \ + projectexplorer_export.h \ qtpatchoperation.h \ setdemospathonqtoperation.h \ setexamplespathonqtoperation.h \ @@ -57,6 +59,7 @@ HEADERS += $$PWD/qinstaller.h \ linereplaceoperation.h \ registerdocumentationoperation.h \ registerqtoperation.h \ + registertoolchainoperation.h \ setqtcreatorvalueoperation.h \ copydirectoryoperation.h \ simplemovefileoperation.h \ @@ -111,6 +114,7 @@ SOURCES += $$PWD/qinstaller.cpp \ qinstallercomponent.cpp \ qinstallercomponentmodel.cpp \ qtpatch.cpp \ + persistentsettings.cpp \ qtpatchoperation.cpp \ setdemospathonqtoperation.cpp \ setexamplespathonqtoperation.cpp \ @@ -120,6 +124,7 @@ SOURCES += $$PWD/qinstaller.cpp \ linereplaceoperation.cpp \ registerdocumentationoperation.cpp \ registerqtoperation.cpp \ + registertoolchainoperation.cpp \ setqtcreatorvalueoperation.cpp \ copydirectoryoperation.cpp \ simplemovefileoperation.cpp \ |