From 560b6899c7bc6523f2dda7ed62cb67b60101e03d Mon Sep 17 00:00:00 2001 From: Konrad Lorentz Date: Wed, 24 Oct 2012 11:48:11 +0200 Subject: [PATCH 1/2] Static linked qt requires an include of QNetwork in tools --- src/libs/installer/installer.pro | 2 ++ tools/archivegen/archivegen.pro | 2 +- tools/binarycreator/binarycreator.pro | 1 + tools/repogen/repogen.pro | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 4081b5b..5b3c83d 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -1,4 +1,6 @@ TEMPLATE = lib +#CONFIG += staticlib warn_on +CONFIG += static TARGET = installer DEPENDPATH += . .. INCLUDEPATH += . .. diff --git a/tools/archivegen/archivegen.pro b/tools/archivegen/archivegen.pro index 886a985..d0dce44 100644 --- a/tools/archivegen/archivegen.pro +++ b/tools/archivegen/archivegen.pro @@ -7,7 +7,7 @@ include(../../installerfw.pri) QT -= gui QT += script - +QT += network CONFIG += console CONFIG -= app_bundle DESTDIR = $$IFW_APP_PATH diff --git a/tools/binarycreator/binarycreator.pro b/tools/binarycreator/binarycreator.pro index 2e36e15..e7e4455 100644 --- a/tools/binarycreator/binarycreator.pro +++ b/tools/binarycreator/binarycreator.pro @@ -7,6 +7,7 @@ include(../../installerfw.pri) QT -= gui QT += script +QT += network CONFIG += console CONFIG -= app_bundle diff --git a/tools/repogen/repogen.pro b/tools/repogen/repogen.pro index e4df1f5..295a1db 100644 --- a/tools/repogen/repogen.pro +++ b/tools/repogen/repogen.pro @@ -7,6 +7,7 @@ include(../../installerfw.pri) QT -= gui QT += script +QT += network CONFIG += console CONFIG -= app_bundle -- 1.7.11.rc2 From b18d854835c0a8c23c23397547277bb6e2317547 Mon Sep 17 00:00:00 2001 From: Konrad Lorentz Date: Wed, 24 Oct 2012 11:58:54 +0200 Subject: [PATCH 2/2] Static linked qt requires an include of QNetwork in tools --- src/libs/installer/installer.pro | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 5b3c83d..f6eefd9 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -1,5 +1,4 @@ TEMPLATE = lib -#CONFIG += staticlib warn_on CONFIG += static TARGET = installer DEPENDPATH += . .. -- 1.7.11.rc2