diff options
| -rw-r--r-- | src/serialport/qt4support/serialport.prf | 11 | ||||
| -rw-r--r-- | src/serialport/serialport.pro | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/serialport/qt4support/serialport.prf b/src/serialport/qt4support/serialport.prf index c8bf5de..460e201 100644 --- a/src/serialport/qt4support/serialport.prf +++ b/src/serialport/qt4support/serialport.prf @@ -1,5 +1,8 @@ -!exists($$[QT_INSTALL_HEADERS]/QtSerialPort) { - INCLUDEPATH += $$QTSERIALPORT_BUILD_ROOT/include $$QTSERIALPORT_BUILD_ROOT/include/QtSerialPort +qtAddLibrary(QtSerialPort) + +!isEmpty(QTSERIALPORT_BUILD_ROOT) { + INCLUDEPATH -= $$QMAKE_INCDIR_QT/QtSerialPort + QMAKE_INCDIR += $$QTSERIALPORT_BUILD_ROOT/include $$QTSERIALPORT_BUILD_ROOT/include/QtSerialPort QTSERIALPORT_BUILD_SUBDIR = src/serialport win32 { @@ -10,11 +13,9 @@ } } - LIBS += -L$$QTSERIALPORT_BUILD_ROOT/$$QTSERIALPORT_BUILD_SUBDIR + QMAKE_LIBDIR += $$QTSERIALPORT_BUILD_ROOT/$$QTSERIALPORT_BUILD_SUBDIR } -qtAddLibrary(QtSerialPort) - mac { LIBS -= -framework QtSerialPort$${QT_LIBINFIX} diff --git a/src/serialport/serialport.pro b/src/serialport/serialport.pro index 354bacb..d329a0b 100644 --- a/src/serialport/serialport.pro +++ b/src/serialport/serialport.pro @@ -13,6 +13,5 @@ greaterThan(QT_MAJOR_VERSION, 4) { TARGET = $$qtLibraryTarget(QtSerialPort$$QT_LIBINFIX) include($$PWD/qt4support/install-helper.pri) CONFIG += module create_prl - win32|mac:CONFIG += debug_and_release mac:QMAKE_FRAMEWORK_BUNDLE_NAME = $$TARGET } |