From cbdf33337892590c7f81ce37d8f67894912753af Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sun, 10 Mar 2024 16:42:41 +0300 Subject: [PATCH] Avoid setting CONFIG=thread in qmake.conf Otherwise it's impossible to override in ./configure Signed-off-by: Alexander Golubev --- mkspecs/dilos-g++/qmake.conf | 2 +- mkspecs/freebsd-clang/qmake.conf | 2 +- mkspecs/linux-clang/qmake.conf | 2 +- mkspecs/linux-g++-sparc/qmake.conf | 2 +- 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 669c316d..8574f9bf 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 a3a2da46..639052d9 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 6ed9a256..2e229674 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 79010acd..4c39abcb 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 ad959384..f717e6fe 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