summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2013-02-17 14:21:52 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-17 18:17:04 +0100
commit899d2115829afa58d0d37caab97e12719680193c (patch)
tree77754fc0b9662d75a0a837d322b7df06aed22aea
parente6a3a10fb4efc1323a9b8b494cafce0d13c9f325 (diff)
downloadqtserialport-899d2115829afa58d0d37caab97e12719680193c.tar.gz
Move the define to the Qt4 support folder
This is not necessary on Linux when building with gcc. However, I will not put this into the win32 { ... } branch that can be found in that install-helper.pri already because I have not tested this for cross-compilation with mingw on Linux to Windows. I am not sure about Mac either. So, even though this is not necessary on Linux, it is safer to but into the "common" not to cause breakages for now. This is for sure not necessary for Qt5 as none of the other modules use such defines that I have checked, at least. Change-Id: Ic4d3f0a7d5687e1a91271f09574fe7b99738cb59 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
-rw-r--r--src/serialport/qt4support/install-helper.pri1
-rw-r--r--src/serialport/serialport.pro1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/serialport/qt4support/install-helper.pri b/src/serialport/qt4support/install-helper.pri
index 9053fa6..5257709 100644
--- a/src/serialport/qt4support/install-helper.pri
+++ b/src/serialport/qt4support/install-helper.pri
@@ -40,3 +40,4 @@ target.path = $$[QT_INSTALL_LIBS]
INSTALLS += target
INCLUDEPATH += $$QTSERIALPORT_BUILD_ROOT/include $$QTSERIALPORT_BUILD_ROOT/include/QtSerialPort
+DEFINES += QT_BUILD_SERIALPORT_LIB
diff --git a/src/serialport/serialport.pro b/src/serialport/serialport.pro
index 1eab266..6b57690 100644
--- a/src/serialport/serialport.pro
+++ b/src/serialport/serialport.pro
@@ -1,5 +1,4 @@
QT = core
-DEFINES += QT_BUILD_SERIALPORT_LIB
include($$PWD/doc/doc.pri)
include($$PWD/serialport-lib.pri)