Martchus
defbb48223
* Make it possible to use shared and static Qt build (installed in the same prefix) at the same time in a project. * This allows compiling shared and static libraries depending on Qt in one step. * Static CMake modules are prefixed with 'Static', eg. 'StaticQt5Core' and provide importet targets as eg. 'Qt5::static::Core'.
27 lines
840 B
Diff
27 lines
840 B
Diff
From 63595b743f993ab734821f7f415cc63bf1dba9ca Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 18:20:25 +0200
|
|
Subject: [PATCH 19/25] Disable determing default include and lib dirs at qmake
|
|
time when building with mingw-w64
|
|
|
|
---
|
|
mkspecs/features/default_pre.prf | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
|
|
index cffffdc..6445481 100644
|
|
--- a/mkspecs/features/default_pre.prf
|
|
+++ b/mkspecs/features/default_pre.prf
|
|
@@ -29,7 +29,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build {
|
|
#
|
|
# Get default include and library paths from compiler
|
|
#
|
|
- gcc {
|
|
+ !win32:gcc {
|
|
equals(QMAKE_DIR_SEP, /) {
|
|
cmd_prefix = "LC_ALL=C"
|
|
cmd_suffix = "</dev/null >/dev/null"
|
|
--
|
|
2.10.1
|
|
|