diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2019-07-25 08:57:10 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-07-25 08:57:10 +0200 |
| commit | 3d1eb2af8e34289602bb4586a111c5eb466ca713 (patch) | |
| tree | 10216cb069324faee3f9152adbcb5272d922b5a5 | |
| parent | 548d0678a47f0d67ed3660ae278755f1cb2d8e78 (diff) | |
| parent | 1b525fb6ff64ef7dd8955637b074a76c7ffceba9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I121776dd854786b67aae85689de526a80f3c9e37
| -rw-r--r-- | src/knx/core/core.pri | 4 | ||||
| -rw-r--r-- | src/knx/knx.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/knx/core/core.pri b/src/knx/core/core.pri index 92ee5a5..4a31691 100644 --- a/src/knx/core/core.pri +++ b/src/knx/core/core.pri @@ -1,7 +1,7 @@ INCLUDEPATH += $$PWD SOURCES += \ - $$PWD\qknxbytearray.cpp + $$PWD/qknxbytearray.cpp HEADERS += \ - $$PWD\qknxbytearray.h + $$PWD/qknxbytearray.h diff --git a/src/knx/knx.pro b/src/knx/knx.pro index dda00b1..918f0fb 100644 --- a/src/knx/knx.pro +++ b/src/knx/knx.pro @@ -6,7 +6,7 @@ QT_FOR_PRIVATE += network core-private network-private QMAKE_DOCS = $$PWD/doc/qtknx.qdocconf -include (core/core.pri) +include(core/core.pri) include(dpt/dpt.pri) include(ets/ets.pri) include(knxproj/knxproj.pri) |