From f8d48bd39c4d2caef1dc189bd3bd95c5f5010780 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 17 Sep 2013 10:21:47 +0200 Subject: Fix incremental builds The missing dependency to installer library causes corrupted incremental builds, installerbase should be rebuild when installer lib is changed. Change-Id: I588577f3d178c70dff2d84747f221d924e5cf38e Reviewed-by: Karsten Heimrich --- installerfw.pri | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'installerfw.pri') diff --git a/installerfw.pri b/installerfw.pri index 4a42d3325..ba24910df 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -106,6 +106,8 @@ static { LIBS += -l7z win32-g++*: LIBS += -lmpr -luuid - win32:exists($$IFW_LIB_PATH/installer.lib):POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib - unix:exists($$IFW_LIB_PATH/libinstaller.a):POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a + equals(TEMPLATE, app) { + win32:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib + unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a + } } -- cgit v1.2.3 From 79c1b8646f4b85c1154d9eca9950cc93b1776732 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 18 Sep 2013 17:29:39 +0200 Subject: Check for mingw-gcc vs mingw-msvc when checking dependences Fixes wrong library naiming when running with mingw-gcc Change-Id: Id8bf210f1a119e296a212a9d0570a4c918e780c5 Reviewed-by: Tim Jenssen --- installerfw.pri | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'installerfw.pri') diff --git a/installerfw.pri b/installerfw.pri index ba24910df..1dfee1e63 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -107,7 +107,8 @@ static { win32-g++*: LIBS += -lmpr -luuid equals(TEMPLATE, app) { - win32:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib + win32-msvc*:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib + win32-g++*:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a } } -- cgit v1.2.3 From 047844cddf143ecfddac90040eecd966f2e20b65 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Fri, 27 Sep 2013 12:45:58 +0200 Subject: Fix possible crash. Disable close button during installer run. Change-Id: I6a0affab7394e3ae9669904bbfc48617b5cb1bd5 Reviewed-by: Tim Jenssen --- installerfw.pri | 3 +++ 1 file changed, 3 insertions(+) (limited to 'installerfw.pri') diff --git a/installerfw.pri b/installerfw.pri index 1dfee1e63..0271433cd 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -56,6 +56,9 @@ unix:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/7zip/unix/CPP LIBS += -L$$IFW_LIB_PATH # The order is important. The linker needs to parse archives in reversed dependency order. equals(TEMPLATE, app):LIBS += -linstaller +win32:equals(TEMPLATE, app) { + LIBS += -luser32 +} unix:!macx:LIBS += -lutil macx:LIBS += -framework Carbon -framework Security -- cgit v1.2.3