diff options
author | Alexander Golubev <fatzer2@gmail.com> | 2024-03-10 16:42:41 +0300 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-03-11 11:46:42 +0900 |
commit | 5232ccdf6460466ce8cfd5058b3c6ebdf7e65e73 (patch) | |
tree | 423ec245a63837cb58795670d7baee2ee3decc7f | |
parent | d643d19c963f1ede982fc107b8038f37dadf27f4 (diff) | |
download | tqt3-5232ccdf6460466ce8cfd5058b3c6ebdf7e65e73.tar.gz tqt3-5232ccdf6460466ce8cfd5058b3c6ebdf7e65e73.zip |
Avoid setting CONFIG=thread in qmake.conf
Otherwise it's impossible to override in ./configure
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit cbdf33337892590c7f81ce37d8f67894912753af)
-rw-r--r-- | mkspecs/dilos-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/freebsd-clang/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/linux-clang/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/linux-g++-sparc/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/linux-g++/qmake.conf | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/dilos-g++/qmake.conf b/mkspecs/dilos-g++/qmake.conf index 669c316df..8574f9bfb 100644 --- a/mkspecs/dilos-g++/qmake.conf +++ b/mkspecs/dilos-g++/qmake.conf @@ -5,7 +5,7 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release incremental link_prl thread +CONFIG += qt warn_on release incremental link_prl QMAKE_INCREMENTAL_STYLE = sublib QMAKE_CC = gcc diff --git a/mkspecs/freebsd-clang/qmake.conf b/mkspecs/freebsd-clang/qmake.conf index a3a2da461..639052d9a 100644 --- a/mkspecs/freebsd-clang/qmake.conf +++ b/mkspecs/freebsd-clang/qmake.conf @@ -5,7 +5,7 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release thread link_prl +CONFIG += qt warn_on release link_prl QMAKE_CC = clang QMAKE_LEX = flex diff --git a/mkspecs/linux-clang/qmake.conf b/mkspecs/linux-clang/qmake.conf index 6ed9a256b..2e2296744 100644 --- a/mkspecs/linux-clang/qmake.conf +++ b/mkspecs/linux-clang/qmake.conf @@ -5,7 +5,7 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release incremental link_prl thread +CONFIG += qt warn_on release incremental link_prl QMAKE_INCREMENTAL_STYLE = sublib QMAKE_CC = clang diff --git a/mkspecs/linux-g++-sparc/qmake.conf b/mkspecs/linux-g++-sparc/qmake.conf index 79010acd7..4c39abcb3 100644 --- a/mkspecs/linux-g++-sparc/qmake.conf +++ b/mkspecs/linux-g++-sparc/qmake.conf @@ -5,7 +5,7 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release incremental link_prl thread +CONFIG += qt warn_on release incremental link_prl QMAKE_INCREMENTAL_STYLE = sublib QMAKE_CC = gcc diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf index ad959384e..f717e6feb 100644 --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf @@ -5,7 +5,7 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release incremental link_prl thread +CONFIG += qt warn_on release incremental link_prl QMAKE_INCREMENTAL_STYLE = sublib QMAKE_CC = gcc |