diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-10-06 06:22:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-09 13:01:51 +0200 |
| commit | 50ab4d4a8ff5f882b9699cbde26ad9d8824a4824 (patch) | |
| tree | 7455c7af7dd31eb449bc95986d5b7ed20c781080 /src/serialport/qserialport_p.h | |
| parent | 43f7c62509f71b16b263f4280ee55a350696ca00 (diff) | |
| download | qtserialport-50ab4d4a8ff5f882b9699cbde26ad9d8824a4824.tar.gz | |
Eliminate the ifdef in the code for imported headers (qt4support)
As I previously wrote on Gerrit, this idea of resembling the include hiearchy
inside qt4support has two advantages:
1) The includes are well-separated for Qt 4 that are imported.
2) The code is less complex due to the non-existence of ifdefs for major Qt
variants.
The only disadvantage is that the build system got one additional line, but the
benefits outweigh that.
This has been (only build!) tested on Linux (Arch) with Qt 4 and then 5.
Change-Id: Ic33632cd0e569693a65af094479dac0a02b1a7f7
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialport_p.h')
| -rw-r--r-- | src/serialport/qserialport_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h index cb6a748..4140493 100644 --- a/src/serialport/qserialport_p.h +++ b/src/serialport/qserialport_p.h @@ -46,11 +46,7 @@ #include "qserialport.h" -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) #include <private/qringbuffer_p.h> -#else -#include "qt4support/qringbuffer_p.h" -#endif QT_BEGIN_NAMESPACE |