Skip to content

Commit

Permalink
QMake: Fixing the right .pro file to add QNetwork to tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
dvorka committed Feb 4, 2024
1 parent 0e1e92e commit f5bb19e
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
20 changes: 0 additions & 20 deletions lib/test/mindforger-lib-unit-tests.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
24 changes: 22 additions & 2 deletions lib/test/src/src.pro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# mindforger-lib-unit-tests.pro MindForger thinking notebook
# src.pro MindForger thinking notebook
#
# Copyright (C) 2016-2024 Martin Dvorak <[email protected]>
#
Expand All @@ -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
Expand Down Expand Up @@ -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

0 comments on commit f5bb19e

Please sign in to comment.