From ef736414042137b215393f139f5e33f06ff4982d Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Fri, 28 Dec 2018 18:34:12 +0100 Subject: [PATCH] bugfix: staticlib also built a shared lib --- sharedlib/README.md | 6 +++--- staticlib/README.md | 2 +- staticlib/jkqtfastplotterlib.pro | 2 +- staticlib/jkqtmathtextlib.pro | 2 +- staticlib/jkqtplotterlib.pro | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sharedlib/README.md b/sharedlib/README.md index 6c01938523..4578187cb5 100644 --- a/sharedlib/README.md +++ b/sharedlib/README.md @@ -10,12 +10,12 @@ There are several `.PRO`-files, that can be used to build the full library, or a ```qmake # include JKQtPlotter library -DEPENDPATH += . /lib +DEPENDPATH += /lib INCLUDEPATH += /lib CONFIG (debug, debug|release) { - LIBS += -L/staticlib/debug -ljkqtplotterlib_debug + LIBS += -L/sharedlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L/staticlib/release -ljkqtplotterlib + LIBS += -L/sharedlib/release -ljkqtplotterlib } ``` diff --git a/staticlib/README.md b/staticlib/README.md index e2d374af73..a45e58699f 100644 --- a/staticlib/README.md +++ b/staticlib/README.md @@ -10,7 +10,7 @@ There are several `.PRO`-files, that can be used to build the full library, or a ```qmake # include JKQtPlotter library -DEPENDPATH += . /lib +DEPENDPATH += /lib INCLUDEPATH += /lib CONFIG (debug, debug|release) { LIBS += -L/staticlib/debug -ljkqtplotterlib_debug diff --git a/staticlib/jkqtfastplotterlib.pro b/staticlib/jkqtfastplotterlib.pro index cffd1d78a8..6b63ccfedc 100644 --- a/staticlib/jkqtfastplotterlib.pro +++ b/staticlib/jkqtfastplotterlib.pro @@ -2,6 +2,6 @@ TARGET = jkqtfastplotterlib CONFIG (debug, debug|release): TARGET = jkqtfastplotterlib_debug TEMPLATE = lib -CONFIG+=dll +CONFIG+=staticlib include(../lib/jkqtfastplotter.pri) diff --git a/staticlib/jkqtmathtextlib.pro b/staticlib/jkqtmathtextlib.pro index aefe7001ab..79a6a68a33 100644 --- a/staticlib/jkqtmathtextlib.pro +++ b/staticlib/jkqtmathtextlib.pro @@ -2,6 +2,6 @@ TARGET = jkqtmathtextlib CONFIG (debug, debug|release): TARGET = jkqtmathtextlib_debug TEMPLATE = lib -CONFIG+=dll +CONFIG+=staticlib include(../lib/jkqtmathtext.pri) diff --git a/staticlib/jkqtplotterlib.pro b/staticlib/jkqtplotterlib.pro index c47edb64a1..13b334ca9f 100644 --- a/staticlib/jkqtplotterlib.pro +++ b/staticlib/jkqtplotterlib.pro @@ -2,6 +2,6 @@ TARGET = jkqtplotterlib CONFIG (debug, debug|release): TARGET = jkqtplotterlib_debug TEMPLATE = lib -CONFIG += dll +CONFIG += staticlib include(../lib/jkqtplotter.pri)