summaryrefslogtreecommitdiffstats
path: root/config.tests/win/directwrite2
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-15 14:40:52 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-18 17:09:52 +0000
commitc0cc5052097c723d0331a7619d686af9eb93d33c (patch)
treeab2fe3240e4542ddb085fd78a9adc453e3a857eb /config.tests/win/directwrite2
parent4b8dd9c846223402d181555f56a0146a2d7b86f8 (diff)
rewrite library handling in configure
so far, each library was distributed over a test and (optionally) a 'library' output of a feature. this was conceptually messy and limiting. so instead, turn libraries into a category of their own. libraries now support multiple properly separated sources, which makes overriding them a lot saner. sources can be conditional to accommodate platform differences. as an immediate consequence, move (almost) all library references from the config test projects to the json file. a few tests were excluded, because they are doing somewhat magic things that should not be handled in this bulk change: - freetype: .pri file shared with actual source code - clock-gettime: -lrt is conditional, and there is a .pri file which is shared with actual source code - ipc_posix: -lrt & -lpthread conditional - iconv: -liconv conditional the multi-source mechanism is used to make a variety of tests work on windows, where the library name differs from unix (and sometimes between build configurations). some tests still needed minor adjustments to actually work. on the way, fix up disagreements between manually specified libraries and pkg-config lines (affecting several xcb-related tests). Change-Id: Ic8c58556fa0cf8f981d386b13ea34b4431b127c5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'config.tests/win/directwrite2')
-rw-r--r--config.tests/win/directwrite2/directwrite2.pro1
1 files changed, 0 insertions, 1 deletions
diff --git a/config.tests/win/directwrite2/directwrite2.pro b/config.tests/win/directwrite2/directwrite2.pro
index ec37247017..5d6fe24a4b 100644
--- a/config.tests/win/directwrite2/directwrite2.pro
+++ b/config.tests/win/directwrite2/directwrite2.pro
@@ -1,4 +1,3 @@
SOURCES = directwrite2.cpp
-LIBS += -ldwrite
CONFIG -= qt
CONFIG += console