diff options
| author | Marcel Krems <m.krems@software-vision.eu> | 2014-04-02 18:07:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-03 16:14:33 +0200 |
| commit | 4a634dde17361f41b83c92f562714daf8aa51249 (patch) | |
| tree | 693b1562457f333797f340a4e5a537b864733840 | |
| parent | 0bd5074ae1879c336a1a59d3429616a3c8104ba1 (diff) | |
| download | qtserialport-4a634dde17361f41b83c92f562714daf8aa51249.tar.gz | |
Don't remove -framework on Mac.
"LIBS -= -framework QtSerialPort" removes all occurrences of -framework
which breaks the build if you use a framework together with QtSerialPort.
To avoid this we skip the call to qtAddLibrary under Mac.
Task-number: QTBUG-37989
Change-Id: I53b71ad433e93c8c59d17c526ef2424db47bca15
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
| -rw-r--r-- | src/serialport/qt4support/serialport.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialport/qt4support/serialport.prf b/src/serialport/qt4support/serialport.prf index 9779b4c..b1d65e1 100644 --- a/src/serialport/qt4support/serialport.prf +++ b/src/serialport/qt4support/serialport.prf @@ -1,4 +1,4 @@ -qtAddLibrary(QtSerialPort) +!mac:qtAddLibrary(QtSerialPort) !isEmpty(QTSERIALPORT_BUILD_ROOT) { INCLUDEPATH -= $$QMAKE_INCDIR_QT/QtSerialPort @@ -17,7 +17,7 @@ qtAddLibrary(QtSerialPort) } mac { - LIBS -= -framework QtSerialPort$${QT_LIBINFIX} + INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtSerialPort if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { LIBS += -lQtSerialPort$${QT_LIBINFIX}_debug |