From 5e8081e088fb8d5db0ac38046ab6dfcad9eda24e Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Thu, 20 Jun 2019 22:30:06 +0200 Subject: [PATCH] bugfixed build-scripts --- .../jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro | 8 ++++---- qmake/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro | 4 ++-- qmake/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro | 4 ++-- qmake/sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro | 2 +- qmake/sharedlib/jkqtplotterlib/jkqtplotterlib.pro | 8 ++++---- qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro | 4 ++-- qmake/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro | 4 ++-- qmake/staticlib/jkqtpcommonlib/jkqtpcommonlib.pro | 2 +- qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro | 8 ++++---- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro index fe130a232a..36616d0ab3 100644 --- a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro +++ b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro @@ -8,12 +8,12 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport -DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib -INCLUDEPATH += ../../lib +DEPENDPATH += ../../../lib ../../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../../lib CONFIG (debug, debug|release) { - LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/qmake/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro b/qmake/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro index 0808641991..96c8837965 100644 --- a/qmake/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro +++ b/qmake/sharedlib/jkqtfastplotterlib/jkqtfastplotterlib.pro @@ -12,8 +12,8 @@ win32 { DEFINES += JKQTP_LIB_EXPORT_LIBRARY } -include(../../lib/jkqtfastplotter.pri) -include(../../lib/jkqtpcommon.pri) +include(../../../lib/jkqtfastplotter.pri) +include(../../../lib/jkqtpcommon.pri) win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX diff --git a/qmake/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro b/qmake/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro index 2852f42980..79d1e03e71 100644 --- a/qmake/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro +++ b/qmake/sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro @@ -12,8 +12,8 @@ win32 { DEFINES += JKQTP_LIB_EXPORT_LIBRARY } -include(../../lib/jkqtmathtext.pri) -include(../../lib/jkqtpcommon.pri) +include(../../../lib/jkqtmathtext.pri) +include(../../../lib/jkqtpcommon.pri) win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX diff --git a/qmake/sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro b/qmake/sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro index 00384c1b5e..9a2a26bdb4 100644 --- a/qmake/sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro +++ b/qmake/sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro @@ -12,7 +12,7 @@ win32 { DEFINES += JKQTP_LIB_EXPORT_LIBRARY } -include(../../lib/jkqtpcommon.pri) +include(../../../lib/jkqtpcommon.pri) win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX diff --git a/qmake/sharedlib/jkqtplotterlib/jkqtplotterlib.pro b/qmake/sharedlib/jkqtplotterlib/jkqtplotterlib.pro index 0311c5bec7..1ca06479d8 100644 --- a/qmake/sharedlib/jkqtplotterlib/jkqtplotterlib.pro +++ b/qmake/sharedlib/jkqtplotterlib/jkqtplotterlib.pro @@ -16,7 +16,7 @@ win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX -include(../../lib/jkqtplotter.pri) -include(../../lib/jkqtpcommon.pri) -include(../../lib/jkqtmathtext.pri) -include(../../lib/jkqtfastplotter.pri) \ No newline at end of file +include(../../../lib/jkqtplotter.pri) +include(../../../lib/jkqtpcommon.pri) +include(../../../lib/jkqtmathtext.pri) +include(../../../lib/jkqtfastplotter.pri) \ No newline at end of file diff --git a/qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro b/qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro index e41c996c2f..e9b0de59d3 100644 --- a/qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro +++ b/qmake/staticlib/jkqtfastplotterlib/jkqtfastplotterlib.pro @@ -7,8 +7,8 @@ TEMPLATE = lib CONFIG+=staticlib CONFIG += create_prl -include(../../lib/jkqtfastplotter.pri) -include(../../lib/jkqtpcommon.pri) +include(../../../lib/jkqtfastplotter.pri) +include(../../../lib/jkqtpcommon.pri) win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX diff --git a/qmake/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro b/qmake/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro index 69b2f47555..e952c5c45d 100644 --- a/qmake/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro +++ b/qmake/staticlib/jkqtmathtextlib/jkqtmathtextlib.pro @@ -7,8 +7,8 @@ TEMPLATE = lib CONFIG += staticlib CONFIG += create_prl -include(../../lib/jkqtmathtext.pri) -include(../../lib/jkqtpcommon.pri) +include(../../../lib/jkqtmathtext.pri) +include(../../../lib/jkqtpcommon.pri) win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX diff --git a/qmake/staticlib/jkqtpcommonlib/jkqtpcommonlib.pro b/qmake/staticlib/jkqtpcommonlib/jkqtpcommonlib.pro index 89f6ebb467..4f75d56276 100644 --- a/qmake/staticlib/jkqtpcommonlib/jkqtpcommonlib.pro +++ b/qmake/staticlib/jkqtpcommonlib/jkqtpcommonlib.pro @@ -7,7 +7,7 @@ TEMPLATE = lib CONFIG += staticlib CONFIG += create_prl -include(../../lib/jkqtpcommon.pri) +include(../../../lib/jkqtpcommon.pri) win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX diff --git a/qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro b/qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro index ce00e09b6e..253c442d84 100644 --- a/qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro +++ b/qmake/staticlib/jkqtplotterlib/jkqtplotterlib.pro @@ -9,10 +9,10 @@ CONFIG += create_prl #DEFINES += JKQTBP_AUTOTIMER -include(../../lib/jkqtpcommon.pri) -include(../../lib/jkqtplotter.pri) -include(../../lib/jkqtmathtext.pri) -include(../../lib/jkqtfastplotter.pri) +include(../../../lib/jkqtpcommon.pri) +include(../../../lib/jkqtplotter.pri) +include(../../../lib/jkqtmathtext.pri) +include(../../../lib/jkqtfastplotter.pri) win32-msvc*: DEFINES += _USE_MATH_DEFINES win32-msvc*: DEFINES += NOMINMAX