diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | LGPL_EXCEPTION.txt | 22 | ||||
| -rw-r--r-- | dist/changes-5.12.0 | 18 | ||||
| -rw-r--r-- | qtserialport.pro | 2 | ||||
| -rw-r--r-- | src/serialport/serialport-lib.pri | 2 |
5 files changed, 22 insertions, 24 deletions
diff --git a/.qmake.conf b/.qmake.conf index d920a9c..097d8b9 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.11.3 +MODULE_VERSION = 5.12.0 diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt deleted file mode 100644 index bd94b55..0000000 --- a/LGPL_EXCEPTION.txt +++ /dev/null @@ -1,22 +0,0 @@ -The Qt Company Qt LGPL Exception version 1.1 - -As an additional permission to the GNU Lesser General Public License version -2.1, the object code form of a "work that uses the Library" may incorporate -material from a header file that is part of the Library. You may distribute -such object code under terms of your choice, provided that: - (i) the header files of the Library have not been modified; and - (ii) the incorporated material is limited to numerical parameters, data - structure layouts, accessors, macros, inline functions and - templates; and - (iii) you comply with the terms of Section 6 of the GNU Lesser General - Public License version 2.1. - -Moreover, you may apply this exception to a modified version of the Library, -provided that such modification does not involve copying material from the -Library into the modified Library's header files unless such material is -limited to (i) numerical parameters; (ii) data structure layouts; -(iii) accessors; and (iv) small macros, templates and inline functions of -five lines or less in length. - -Furthermore, you are not required to apply this additional permission to a -modified version of the Library. diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0 new file mode 100644 index 0000000..4f6c63e --- /dev/null +++ b/dist/changes-5.12.0 @@ -0,0 +1,18 @@ +Qt 5.12 introduces many new features and improvements as well as bugfixes +over the 5.11.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/qtserialport.pro b/qtserialport.pro index 21fe427..3dabc4b 100644 --- a/qtserialport.pro +++ b/qtserialport.pro @@ -7,6 +7,8 @@ requires(!integrity) requires(!vxworks) requires(!winrt) requires(!uikit) +requires(!android) +requires(!emscripten) load(configure) qtCompileTest(ntddmodm) diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri index bb12df2..ddd31f2 100644 --- a/src/serialport/serialport-lib.pri +++ b/src/serialport/serialport-lib.pri @@ -19,7 +19,7 @@ SOURCES += \ $$PWD/qserialport.cpp \ $$PWD/qserialportinfo.cpp -win32:!wince* { +win32 { SOURCES += \ $$PWD/qserialport_win.cpp \ $$PWD/qserialportinfo_win.cpp \ |