From 2be400e33ede80c1eb90a1f2829da425c6416af5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Aug 2015 21:40:52 +0200
Subject: [PATCH] =?UTF-8?q?CONFIG=20shouldn't=20be=20reset=20at=20qmake=20?=
 =?UTF-8?q?call,=20use=20CONFIG+=3D=E2=80=A6=20instead?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With CONFIG=…, the default values of CONFIG are cleared, with qt4 this
doesn't seem to be a problem, but with qt5 the build fails.

CONFIG=staticlib in openpgpsdk.pro was added in 3caeb0ab7f6912a983dd52934883995d3ea80a92
for OS X, but is not necessary on linux
---
 README.md                                     | 4 ++--
 build_scripts/Debian+Ubuntu/debian/rules      | 2 +-
 build_scripts/RedHat+Fedora/retroshare06.spec | 2 +-
 openpgpsdk/src/openpgpsdk.pro                 | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 617794d77..88d1c5a87 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Compilation on Linux
 3. Compile
    ```bash
    cd trunk
-   qmake CONFIG=debug
+   qmake CONFIG+=debug
    make
    ```
 
@@ -55,7 +55,7 @@ For packagers
 -------------
 Packagers can use PREFIX and LIB\_DIR to customize the installation paths:
 ```bash
-qmake PREFIX=/usr LIB_DIR=/usr/lib64
+qmake PREFIX=/usr LIB_DIR=/usr/lib64 "CONFIG-=debug" "CONFIG+=release"
 make
 make INSTALL_ROOT=${PKGDIR} install
 ```
diff --git a/build_scripts/Debian+Ubuntu/debian/rules b/build_scripts/Debian+Ubuntu/debian/rules
index a0d66eb32..69487e51a 100755
--- a/build_scripts/Debian+Ubuntu/debian/rules
+++ b/build_scripts/Debian+Ubuntu/debian/rules
@@ -3,7 +3,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	cd src && qmake-qt4 CONFIG=release PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro
+	cd src && qmake-qt4 "CONFIG-=debug" "CONFIG+=release" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro
 	touch $@
 
 
diff --git a/build_scripts/RedHat+Fedora/retroshare06.spec b/build_scripts/RedHat+Fedora/retroshare06.spec
index bb8339330..d6ef0ff9f 100644
--- a/build_scripts/RedHat+Fedora/retroshare06.spec
+++ b/build_scripts/RedHat+Fedora/retroshare06.spec
@@ -56,7 +56,7 @@ cd lib/sqlcipher
 make
 cd -
 cd src
-qmake-qt4 CONFIG=release PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro
+qmake-qt4 "CONFIG-=debug" "CONFIG+=release" PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro
 make
 cd -
 
diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro
index 786ee5819..f54f5d7f8 100644
--- a/openpgpsdk/src/openpgpsdk.pro
+++ b/openpgpsdk/src/openpgpsdk.pro
@@ -1,10 +1,10 @@
 !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
 
 TEMPLATE = lib
-win32 {
-	CONFIG += staticlib
-} else {
+macx {
 	CONFIG = staticlib 
+} else {
+	CONFIG += staticlib
 }
 
 DEFINES *= OPENSSL_NO_IDEA