From f5bb19e09228cd8564ae8ab93d357f4ceb3bafbd Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Sun, 4 Feb 2024 08:59:52 +0100 Subject: [PATCH] QMake: Fixing the right .pro file to add QNetwork to tests. --- lib/test/mindforger-lib-unit-tests.pro | 20 -------------------- lib/test/src/src.pro | 24 ++++++++++++++++++++++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/test/mindforger-lib-unit-tests.pro b/lib/test/mindforger-lib-unit-tests.pro index 6fbdec67..b70ce89f 100644 --- a/lib/test/mindforger-lib-unit-tests.pro +++ b/lib/test/mindforger-lib-unit-tests.pro @@ -17,17 +17,6 @@ TEMPLATE = subdirs -win32|macx { - # Qt Network as CURL replacement on Win - add Qt to libmindforger - CONFIG += qt - QT += network -} else { - CONFIG -= qt -} - -message("= MindForger library test QMake configuration ==========================") -message("Qt version: $$QT_VERSION") - SUBDIRS = lib src # where to find the sub projects - give the folders @@ -37,13 +26,4 @@ src.subdir = ./src # build dependencies src.depends = lib -# ######################################## -# Diagnostics -# ######################################## - -message(DEFINES of app.pro build: $$DEFINES) -message(QMAKE_EXTRA_TARGETS of app.pro build: $$QMAKE_EXTRA_TARGETS) -message(QT of app.pro build: $$QT) -message(PATH is: $$(PATH)) - # eof diff --git a/lib/test/src/src.pro b/lib/test/src/src.pro index e9137a1b..26e4a09c 100644 --- a/lib/test/src/src.pro +++ b/lib/test/src/src.pro @@ -1,4 +1,4 @@ -# mindforger-lib-unit-tests.pro MindForger thinking notebook +# src.pro MindForger thinking notebook # # Copyright (C) 2016-2024 Martin Dvorak # @@ -22,7 +22,18 @@ DEFINES = DO_MF_DEBUG CONFIG += console CONFIG -= app_bundle -CONFIG -= qt + +win32|macx { + # Qt Network as CURL replacement on Win - add Qt to libmindforger + CONFIG += qt + QT += network +} else { + CONFIG -= qt +} + +message("= MindForger library test QMake configuration ==========================") +message("Qt version: $$QT_VERSION") + INCLUDEPATH += $$PWD/../../../lib/src DEPENDPATH += $$PWD/../../../lib/src @@ -139,4 +150,13 @@ SOURCES += \ HEADERS += \ ./test_gear.h +# ######################################## +# Diagnostics +# ######################################## + +message(DEFINES of app.pro build: $$DEFINES) +message(QMAKE_EXTRA_TARGETS of app.pro build: $$QMAKE_EXTRA_TARGETS) +message(QT of app.pro build: $$QT) +message(PATH is: $$(PATH)) + # eof