summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-12-10 17:22:14 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-01-08 18:51:13 +0000
commit2fe363514cf2130ca6135c6c0222e61fc4cb5dc4 (patch)
tree7550ea042533ccd65caffb8dfc29ab5eb0bf68e6
parent5783a915c4e1825c4d9fd34e3d2ab2ca5b8a0c85 (diff)
don't build with explicitlib on unix
judging by the history, this was only ever a workaround for poor rpath handling. we're supposed to be over that. Change-Id: I85601493a05a76ead999e707a2d2e9a430610981 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--mkspecs/features/qt_module.prf3
1 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 1dae370630..3675d7d87f 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -132,7 +132,6 @@ lib_bundle {
}
mac {
- CONFIG += explicitlib
macx-g++ {
QMAKE_CFLAGS += -fconstant-cfstrings
QMAKE_CXXFLAGS += -fconstant-cfstrings
@@ -260,7 +259,7 @@ load(qt_targets)
QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
unix {
- CONFIG += create_libtool explicitlib
+ CONFIG += create_libtool
host_build: \
QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
else: \