summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-11 09:18:49 (GMT)
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-11 09:18:49 (GMT)
commit12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c (patch)
tree6a7312081b98d562c752e33364ddf79e873473cc
parent5ef0cb41e6f2d426642bfe98875076f41ea54ce0 (diff)
parent46170a55710a8cf90650ac641791e199fb066d8f (diff)
downloadqtx11extras-12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c.tar.gz
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts: .qmake.conf Change-Id: I2144151d80b976ebd54c4d921a48a5a52c805352
-rw-r--r--dist/changes-5.11.320
-rw-r--r--src/x11extras/x11extras.pro2
2 files changed, 22 insertions, 0 deletions
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)