diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2012-11-01 21:23:04 +0400 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2012-11-05 13:57:20 +0100 |
commit | db46db74eb0b1afb6a2ff34712b419e20a17f49a (patch) | |
tree | 5756528ef5d7ad6538d997e5d1900d50d288fe6e /examples | |
parent | eca1a6d30a98861cb811cb2faf8d01334e60dd7c (diff) | |
download | qtserialport-db46db74eb0b1afb6a2ff34712b419e20a17f49a.tar.gz |
Updating a project tree for compilation fixing
For optimization and build correction for Qt4/Qt5 there was a need for
unification and modification of a tree of projects.
The previous structure of the project didn't meet the changed requirements
for Qt5 that led to errors of build and complication of possibility of
correction of errors of build.
It is necessary to note the main changes:
* Removed not used /modules direcrory with all content, because it is
autogenerated.
* Moved all contents from /src directory to /src/serialport directory. It
was necessary for simplification of the qmake commands at building
for Qt5 (in particular, there is no need to fill out a module name since
it is the name of directory /serialport).
* Changed the exported macro defines Q_ADDON_SERIALPORT_EXPORT to
Q_SERIALPORT_EXPORT and QT_ADDON_SERIALPORT_LIB to QT_SERIALPORT_LIB. It
was necessary for fixing compilation error for unknown reason on Windows
and Qt5 when used MSVC compiler.
Checked on Windows and Gnu/Linux, also this patch fixes bug:
Task-number: QTPLAYGROUND-5
Change-Id: Idc9ba98115d5961a22ae307c0e4034a56f3223b5
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/cenumerator/cenumerator.pro | 2 | ||||
-rw-r--r-- | examples/enumerator/enumerator.pro | 2 | ||||
-rw-r--r-- | examples/terminal/terminal.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/cenumerator/cenumerator.pro b/examples/cenumerator/cenumerator.pro index 3a77a70..3e20020 100644 --- a/examples/cenumerator/cenumerator.pro +++ b/examples/cenumerator/cenumerator.pro @@ -1,7 +1,7 @@ greaterThan(QT_MAJOR_VERSION, 4) { QT += core serialport } else { - include($$SERIALPORT_PROJECT_ROOT/src/qt4support/serialport.prf) + include($$SERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) } TARGET = cenumerator diff --git a/examples/enumerator/enumerator.pro b/examples/enumerator/enumerator.pro index 92ecb5e..e66ee9e 100644 --- a/examples/enumerator/enumerator.pro +++ b/examples/enumerator/enumerator.pro @@ -1,7 +1,7 @@ greaterThan(QT_MAJOR_VERSION, 4) { QT += widgets serialport } else { - include($$SERIALPORT_PROJECT_ROOT/src/qt4support/serialport.prf) + include($$SERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) } TARGET = enumerator diff --git a/examples/terminal/terminal.pro b/examples/terminal/terminal.pro index 81cc90f..3cdfa22 100644 --- a/examples/terminal/terminal.pro +++ b/examples/terminal/terminal.pro @@ -1,7 +1,7 @@ greaterThan(QT_MAJOR_VERSION, 4) { QT += widgets serialport } else { - include($$SERIALPORT_PROJECT_ROOT/src/qt4support/serialport.prf) + include($$SERIALPORT_PROJECT_ROOT/src/serialport/qt4support/serialport.prf) } TARGET = terminal |