diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:04:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:04:13 +0100 |
| commit | 0f34414b2bb30f7ce3eaf1a3fb69146b15756449 (patch) | |
| tree | 9ac3ac27f8e0d6138dea35286335e7983a58f43c | |
| parent | 220a1cb6c5c7adc1c61f9a086128de178aec8e52 (diff) | |
| parent | 714efee7ca8d2c6bd73782ce77310a08a673dc14 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I21a09f9e3e10d10acdca8f6b7e33388abfc075b8
| -rw-r--r-- | dist/changes-5.14.1 | 20 | ||||
| -rw-r--r-- | examples/opcua/x509/x509.pro | 6 |
2 files changed, 22 insertions, 4 deletions
diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1 new file mode 100644 index 0000000..d008638 --- /dev/null +++ b/dist/changes-5.14.1 @@ -0,0 +1,20 @@ +Qt 5.14.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0. + +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.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +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/examples/opcua/x509/x509.pro b/examples/opcua/x509/x509.pro index f098656..f29b248 100644 --- a/examples/opcua/x509/x509.pro +++ b/examples/opcua/x509/x509.pro @@ -1,12 +1,10 @@ QT += opcua +QT -= gui CONFIG += c++11 DEPENDPATH += INCLUDEPATH -SOURCES += main.cpp \ +SOURCES += main.cpp #install target.path = $$[QT_INSTALL_EXAMPLES]/opcua/x509 INSTALLS += target - -HEADERS += \ - |