summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/installer.pro
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/installer/installer.pro')
-rw-r--r--src/libs/installer/installer.pro21
1 files changed, 16 insertions, 5 deletions
diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro
index 3308876fb..653b65d6f 100644
--- a/src/libs/installer/installer.pro
+++ b/src/libs/installer/installer.pro
@@ -14,6 +14,10 @@ include(../../../installerfw.pri)
# your files if needed
HEADERS += productkeycheck.h
!isEmpty(PRODUCTKEYCHECK_PRI_FILE) {
+ # use undocumented no_batch config which disable the implicit rules on msvc compilers
+ # this fixes the problem that same cpp files in different directories are overwritting
+ # each other
+ CONFIG += no_batch
include($$PRODUCTKEYCHECK_PRI_FILE)
} else {
SOURCES += productkeycheck.cpp
@@ -44,12 +48,14 @@ HEADERS += packagemanagercore.h \
utils.h \
errors.h \
component.h \
+ scriptengine.h \
componentmodel.h \
qinstallerglobal.h \
qtpatch.h \
persistentsettings.h \
projectexplorer_export.h \
qtpatchoperation.h \
+ consumeoutputoperation.h \
setpathonqtcoreoperation.h \
setdemospathonqtoperation.h \
setexamplespathonqtoperation.h \
@@ -58,7 +64,6 @@ HEADERS += packagemanagercore.h \
replaceoperation.h \
linereplaceoperation.h \
registertoolchainoperation.h \
- registerqtvqnxoperation.h \
setqtcreatorvalueoperation.h \
addqtcreatorarrayvalueoperation.h \
copydirectoryoperation.h \
@@ -104,7 +109,10 @@ HEADERS += packagemanagercore.h \
link.h \
createlinkoperation.h \
packagemanagercoredata.h \
- applyproductkeyoperation.h
+ registerqtincreatorqnxoperation.h \
+ applyproductkeyoperation.h \
+ globals.h \
+ graph.h
SOURCES += packagemanagercore.cpp \
packagemanagercore_p.cpp \
@@ -117,10 +125,12 @@ HEADERS += packagemanagercore.h \
fileutils.cpp \
utils.cpp \
component.cpp \
+ scriptengine.cpp \
componentmodel.cpp \
qtpatch.cpp \
persistentsettings.cpp \
qtpatchoperation.cpp \
+ consumeoutputoperation.cpp \
setpathonqtcoreoperation.cpp \
setdemospathonqtoperation.cpp \
setexamplespathonqtoperation.cpp \
@@ -129,7 +139,6 @@ HEADERS += packagemanagercore.h \
replaceoperation.cpp \
linereplaceoperation.cpp \
registertoolchainoperation.cpp \
- registerqtvqnxoperation.cpp \
setqtcreatorvalueoperation.cpp \
addqtcreatorarrayvalueoperation.cpp \
copydirectoryoperation.cpp \
@@ -173,7 +182,9 @@ HEADERS += packagemanagercore.h \
link.cpp \
createlinkoperation.cpp \
packagemanagercoredata.cpp \
- applyproductkeyoperation.cpp
+ registerqtincreatorqnxoperation.cpp \
+ applyproductkeyoperation.cpp \
+ globals.cpp
RESOURCES += resources/patch_file_lists.qrc \
resources/installer.qrc
@@ -189,7 +200,7 @@ unix:!macx:SOURCES += adminauthorization_x11.cpp
LIBS += -l7z
win32 {
- SOURCES += adminauthorization_win.cpp
+ SOURCES += adminauthorization_win.cpp sysinfo_win.cpp
LIBS += -loleaut32 -luser32 # 7zip
LIBS += -ladvapi32 -lpsapi # kdtools