summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:19:36 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:19:36 +0200
commit4fcf15c521b3c147035acf35d89dcd77c134e3bf (patch)
treea436593ff99f8aa512bf79779a5584dfae5860b3
parent0249c2d58619e4f38f72304b1476ade60f970dee (diff)
parentc3f2f14d64c8301cdce8b1a9b383ca8eaaec6406 (diff)
downloadqtx11extras-4fcf15c521b3c147035acf35d89dcd77c134e3bf.tar.gz
Merge 5.12 into 5.12.1
Change-Id: I128bb697b99a16a967814d24f09facf3c48eb45d
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.11.320
-rw-r--r--src/x11extras/x11extras.pro2
3 files changed, 23 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf
index bc074d5..b9d358f 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ load(qt_build_config)
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.12.0
+MODULE_VERSION = 5.12.1
diff --git a/dist/changes-5.11.3 b/dist/changes-5.11.3
new file mode 100644
index 0000000..f71fa34
--- /dev/null
+++ b/dist/changes-5.11.3
@@ -0,0 +1,20 @@
+Qt 5.11.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.11.0 through 5.11.2.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+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/src/x11extras/x11extras.pro b/src/x11extras/x11extras.pro
index a400276..1070d9e 100644
--- a/src/x11extras/x11extras.pro
+++ b/src/x11extras/x11extras.pro
@@ -9,4 +9,6 @@ QT_PRIVATE += gui-private
HEADERS += qx11info_x11.h
SOURCES += qx11info_x11.cpp
+QMAKE_USE_PRIVATE += xcb/nolink
+
load(qt_module)