From a9d903d18f668a6827149f82816caf96ac6365a2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 5 Apr 2018 21:29:53 -0700
Subject: [PATCH 01/17] QSemaphore: Fix 64-bit Linux QSemaphores initialized to
 non-zero
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The original design for the 64-bit futex had the token count replicated
in the high part. But the constructor wasn't setting it. This is one of
the issues I had noticed when investigating QTBUG-66875, but didn't need
to address since the the fix I ended up applying in commit
081c001deb75fa38385d3ff8cbbdb4f788529133 made that unnecessary: the high
part only had the number of waiters.

Unfortunately, when commit f502270c0f06daba75c1da381bd1658d81aa7bba
brought back the token count in the high part, I failed to correct that
problem. As a consequence, every QSemaphore that was initialized in the
constructor to a non-zero value would eventually deadlock.

This commit fixes that oversight.

Task-number: QTBUG-67481
Change-Id: I662b8f168c74440ab1a8fffd1522be6b85adb4d0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io>
---
 src/corelib/thread/qsemaphore.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
index c440d6db39f..e91e859975e 100644
--- a/src/corelib/thread/qsemaphore.cpp
+++ b/src/corelib/thread/qsemaphore.cpp
@@ -291,10 +291,14 @@ public:
 QSemaphore::QSemaphore(int n)
 {
     Q_ASSERT_X(n >= 0, "QSemaphore", "parameter 'n' must be non-negative");
-    if (futexAvailable())
-        u.store(n);
-    else
+    if (futexAvailable()) {
+        quintptr nn = unsigned(n);
+        if (futexHasWaiterCount)
+            nn |= quint64(nn) << 32;    // token count replicated in high word
+        u.store(nn);
+    } else {
         d = new QSemaphorePrivate(n);
+    }
 }
 
 /*!

From b49a2e671a6c01bec0f0140a81f5501074ec8856 Mon Sep 17 00:00:00 2001
From: Kari Oikarinen <kari.oikarinen@qt.io>
Date: Tue, 3 Apr 2018 13:41:41 +0300
Subject: [PATCH 02/17] tst_QPrinter: Use qWaitForWindowActive() to wait for
 dialog

Instead of an unconditional wait.

The QSKIP is necessary because the PDF format is non-native and the Windows
implementation of QPrintDialog doesn't work then.

The macOS implementation has the same warning, so add the check for that OS
as well.

The test has previously passed, since it hasn't seen not actually opening the
dialog as an issue.

Change-Id: Ib53e378b232580358f13e0c5206404412f9e6ee2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
index 88bae686ab3..f68cf5c59c7 100644
--- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
+++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
@@ -592,10 +592,14 @@ void tst_QPrinter::printDialogCompleter()
 {
     QPrintDialog dialog;
     dialog.printer()->setOutputFileName(testPdfFileName(QLatin1String("file")));
+#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN)
+    if (dialog.printer()->outputFormat() != QPrinter::NativeFormat)
+        QSKIP("Dialog cannot be used with non-native formats");
+#endif
     dialog.setEnabledOptions(QAbstractPrintDialog::PrintToFile);
     dialog.show();
 
-    QTest::qWait(100);
+    QVERIFY(QTest::qWaitForWindowActive(&dialog));
 
     QTest::keyClick(&dialog, Qt::Key_Tab);
     QTest::keyClick(&dialog, 'P');

From 335754d0a329bc2ad845b68b40833bbd8428084a Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Fri, 6 Apr 2018 14:53:38 +0200
Subject: [PATCH 03/17] Fix license header for tst_toolingsupport.cpp

Change-Id: Id355afc8eb57a40a0f8d06fa2920f03d94ef9337
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: hjk <hjk@qt.io>
---
 .../other/toolsupport/tst_toolsupport.cpp     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/tests/auto/other/toolsupport/tst_toolsupport.cpp b/tests/auto/other/toolsupport/tst_toolsupport.cpp
index a78bdc34f18..f31a755f9ec 100644
--- a/tests/auto/other/toolsupport/tst_toolsupport.cpp
+++ b/tests/auto/other/toolsupport/tst_toolsupport.cpp
@@ -3,27 +3,26 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of Qt Creator.
+** This file is part of the test suite of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 

From 23b2d2ada5b1b66ad65eda10d70b5b48d32ef9c5 Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@qt.io>
Date: Mon, 5 Mar 2018 16:19:40 +0100
Subject: [PATCH 04/17] Doc: Update Event Transitions Example

- added screenshot
- some modifications to the text

Task-number QTBUG-60635

Change-Id: I57b269f93cdba696b424b5ba008d0f46ac612cda
Reviewed-by: Martin Smith <martin.smith@qt.io>
---
 doc/src/images/transitions.png                | Bin 0 -> 4314 bytes
 .../widgets/doc/src/eventtransitions.qdoc     |  27 +++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 doc/src/images/transitions.png

diff --git a/doc/src/images/transitions.png b/doc/src/images/transitions.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29466f5ab18de8ac71086294625348005b3a3a3
GIT binary patch
literal 4314
zcmbtYXH-*L8U>UmHku$HO(X~?2}OESK}rZ!2uN4yA#|ie1bLuHQ9ybZ0|ZDE1St}c
z&Le<IGg3m44xuL0kjZ;9vvi!d=Fj}N>wf2+@9gt^``oqny7!5(q0ZS;7f#X9(VYeB
z-nvakM=wdcESMN*Pr`cbg=x2Aei~piCMKrQDWgf+kkw!7j=!mwvwz?{Une?K*9ZRo
zPQDINpH9-I0>HO!ngxAZ9S`+4BSkiE5SjvIu4Q&RCTFS|Fa^_tpFLq^|6a&C@wjT+
zNvRS&9MWJ_xdQVT8n3DJ7_tf-hP|r|NQ&ibfDKt~fEmQ}jM+6AbfZ|=HSXJGWdc$%
zae!+(M8RW1fcK0%8Ef+_%$fSW^AjqB!-&9$VBIX_6NiK*#^$|?;4ji%iSV^s)RNni
zeC7&EX;V}|v`?LEQs)33j~^Xf-Z^;mak7-*B>QgFu>yd2+<htT3UhZ~-zq#@0Bd_2
zDz_bjLY-g{fO~oM_x9F|u9}#b@aasd@?5yEL?n8;y6PGj^x|--PL@nQb=pwq^3syT
zd5E@l3}H=>kMGQHkN9LJRZTdwFeAKYV!{u|XV0GH<lyM4k|;x=+^ifNUK*A_3=Bvi
zP5L^K7&yDTe6}XZ$;G873mL4MM<$a~Q#q14HRGBsv<KcE9UWCvR3s)cCv^%lGDISg
zmtTH%mCpvV)m;=W9$6;sg;gQl)YR0ZrKO9RY)aX_z~vilK$Zit`TYt3YR8)`lvD)-
zc#lQWVG0<yjHS5G9A}^{XoV!wfjFR0ClFVpl+bA`;Vjd!EM#{U(nOdQB<FjP&KXr#
zU>_e2w6+i3m<1+KmUupJ%{#%ri`lq-l)PeZSxs&S@<*N{_(m8ayg#W($xf0OYi8iv
zUw5WChAV7$$T2ec{ahgfYdarI&9Tm_4cGPo%83r&`<~*Io?`mX=*3;i-3XP|v$3&p
zu^5R-;7ymX5sMZZeT!f8r!myOkfJM)R8mw_R9gD@SP1*ljZyTf3b~fF3rGQ~VTu(c
zMNk+rNdY#V=5`hR;0`C7zj+gRSOBpfh3SWwc8=l2PTLPyOG39xTt=JtR}H;xxEN;M
z2_p@*k*m_xcf;D!lIL)2*6#um>O_3VsNnls5KhYCj6>+C@>t};_SJOz+_{OSCS-ki
zV?Rba^IRtvPAtoH1S0xXuK~O}x_qUaTtf<q0lX9exwWh)G1fL0zN3;ON-Do+_jCj%
zhHyWrws>)6O(0^ejoY#m+t)NyL#iAn-V|3>7a5Uml4>nddD$zTzIm-}hJ-aWCk8am
z%*+6Ulx)!%85yshp6_UD%b9a2MWdaOA<BMW7Z3d0x3s&kn<g88Z0clU)eg%x<c(6W
zywKPQE7hAqQBA$Q0{6PQAfNfy`gA}|?<*@k!*6@q1yoHhmX4BrV$;57Eb0!Q6vCg@
zo5N)V4{?M}r#g7~0AeDDqoZ?X>@t3xB5hXp6ZBF)-qq{!#bv3@#F<r=7s5<exmvfr
zNn7)ri7=^tg~W@OeCM*04h}0CVs}xV!|5bMaO=n`haC?{OSh13IKz|9Wt8i>gQyMd
z8RZ13uSzHco|MVfhj2+&-H`xUBn`~UWcNbOgA^$onPqwCkBPRS`_W2XWQkY<Hp@3n
z7*7~wyFk=sbN7Afk_UeRFfZ!x##Uj(JzRE1!2`G&F;|jBt#O9`^!e|Wj#H4$_q!4E
zT=u*AiMaUTZ??I&;Z^~jdJFy;+Jxx?8z!OYQ_j74chzOQ-p+ERM}yXr+Y2>E8&$3g
z8lMAB*I93%+>|YugcgA(7c;wkIzG3i!t3F<)^(L6fk^Ur{x*{)d93}KDM{nI6SqC0
z5?MCaJg9}N{x<ds{G2nFxQ@OOSFzBi2!g4SBp$pb@N%?N@8o_U@?$@btc?JAoEY8o
zbRZ6XUa;4A;Qh-+Z+jjcBq3aURwU(3wnHo*KU{-<P`ktLI$lGW3HMMt5^hDKP!4vU
zJQHznKb$1b{_DABoowc?;x;GcIA@Mx?ffIQ^`Iz?HW5ormBI}6m5|Rf%e=-0F0bn$
zAwhiWd-AC-cDBheXwJ}seOfGOTc!BTwYbA?@4ilIcQKQT8Mz`j<$hAw3yY!|N1^z#
zV4j#XB!xuEvc7}qs{O-v@>Zbw#`4Q#z{$cg;o;1V37I&|Y-?cPyTvaheLY6Cj}zlI
zt>(q;1V4%DX9e35%`9AcN@@hxD)E<A2pKLa?XBGE4Ex+EmvSh%;hN|4Lxct+Jx2;y
zeTL8VT~BJPAB5~F06oUuDy2?;5qbJM>l$2ad3E_J;camHrhDmzjZCqj_+yXp@w%7F
z89tU8aI;Sej(_+9bTuBAw!Md&no=S!3&F2dNyM@K@q`%GazRA1!i34ookU*JF9*Pb
z8OvUJb@PyfvWy?0SR-!|9(FDgJ=d-efzCWI$3pQAhWc-_WeLx&MB6=oWvUuK_Hu2Y
zL=o9mGc4~RK4Q>UbtYh?-0ze_-{1;&83nEoShg6T>>)o|#JHvTXo^;FkAg>laxTuS
zUoMvt*ZwqqNRE^*w*pU#KVPn<cF(w48=@h$an27&Y8<=0S-j!A=SZXTt9#!S5bR(*
zrS?%{AkR#)sMB0Yds2f)=-^ZOWS_$q7U9@R7=l7Zi$OM>z}lZfs`x)e(Ld7Ks8t{;
zaipG=Cg&__iGY=*gTBN*ci@*kQKNJo_yu8OI`Y2S*I2$i>8eEToUVc%cE$_jJ=Sac
z#S^;`^W00DH^D{rihw$%!kcdDAt&?29J``PR=Po^hZpE!$8RLi$uSgY(_&*`T3pIj
zSIl?Rx4*gRo5<)*kB8T`%7HAaqFd>0Za|?>oEbfu_urWX+B6VjVLI6HQZ^dM-vIuP
zslWF61>xs1ewq5ez<=)1+vk(kN}htOY~47KX5e|p@3nirv#uOoS%Jgi3pkuCK|tUv
zUN8n#Ue3a&_$(!*RbTEBE!S-Tx$&OGNJ~pAJUl!;;dxPGqxFDn-p*85)Fp3BFz1P1
z3g*i1qVy>a^M3sLE6-t;6$%XTe^UMPl4kt<CbqlqU(cg24U`<1C(^kN0JA&%N%epB
z@^~TN%dv^=ztPfLLWG<DYwH}~FfV<_zmKg=`Y===3od@7Y5Gv}W&$^OOCX5yS+F8Q
zPQ2UEusgqcv$j(~_Mor39HME^FVXK`f%f)$R>oHH{63=BVT8k$T8`Rv+EK4Q5=0!n
zWBhC_XrtuOo{}GAbQB5e^s}(6S}PM!><&-;I>zIN0qKA7%aLTS@V3!CrXtw5F|Ps<
zz=V;=VJU#<JFmTGQHYSktooht?E@{&ompN(@`6!4OLFD*^^w%LHwYdhl?JNBhLpSp
zlTdWyW;fLhM_oKeV0p!@*Cj(r6kYqH;$T3~y-DND;Gw_9N{*bzM`NvVN#Nt&x|x^g
zKrh{H?CQ*og8>V?!DZ79e!<}O$wCrKg?DiVZ9Ltk#R3mNY4~BQq#~v%HP}yLHXl4m
zUs|^BqyR&Qd;9sDocUmq2kj$qG8LDX>x#V8_C2|{QU<x790CQ+8n!%lwTY!dpUhq_
z?c<0Zqu*i-*CXeYj7FepcBO#v_eTSou~q>`&JBf5<JSr6@$>FfQpYf=Qu1&gSzj;R
znS;MOx<$x5Xa&w7-Uf`KS*YY?-cyyaTRW>EL3k9`IbxVk=Mn!hc7WQ3vbI;wQO_vT
zPQGg&n(x^2RwqG8d}GGrwtcAmjbeVpsS8eT@D4=)5oL8DAt5U!=|SSsX)AP2)54P5
z$+!&F)rDx;!7*Y<1Xg@c^o7xcGX7#TH<!d)icU4F#<mA#_1gH=kt1U0HHY83>M1US
zFxX<XwQV`t=$WEgd;*)+8$i3OS|wWAul0tPdy+FaPKhG<!o-pgzHmUMT4$QpZDQvG
z>a-I)QSS4@wRM?WGCKCL%n|1G14ERS8u801-HtLMI7F@c>vui9le!6Pol>5CvI7(I
z1Vu%d_L6%L=|x9fa;BR}t0X=rBr(NzHAPU)Gjwi$VY6|bL*f9cm83ik&Aw|qB>P~+
z<?~=+L5^R)waU(!a(jf|Z|5$<;#J>Vvmm6JAM`Yi$nPfpHeGqpWBXxTVQN?<4yVzz
z&;4lbLCBDF3RDa8c+&W;<2~h3PC~@`9;!)F62JBJ*s@AeL_B-`{A-d~s$9Gs%V$xe
z?m_;s+oB~d{L<<o+EY01aqdWcEh?7iBG<DfAzs-)jUDOjGUk0pp_J*^xn>`%$Ap3u
zP6=(hiTpmNb9DICzJwrO_90+ke?EZmRvxQ{E^^xjGBTG=80XJML$Xw**C!Cy8x`(Z
zy%BD=FvT|ZKXX#h(~;!s9k9S)4-tZgWES>_!1*YjkKxpy55gCtS(C$$#>?R&l%RIt
z5#i8v5s*?|_;IZcDVxBl*U^DVJI@^bYC+U%u;K%zU~e|o)2d-5O=mcelQO;f?E@z7
z{`oAVTZ`5H!oWLw^N5kEa`VIGtZ;CTx#I=Rq%m2_L@XAhc2IeBp0N29$?Rq1M+rsL
zQyaG+&USulbMb<hP?*nHmt1!#n8y0@#}*?5!odx^*lQ%1HK{xJyE^qyR6S_+D9VVs
z-W05*1)<JP)vU>FpJ<(Gz6I!>*)TIR<KW`b8T9lTtMl30oRx@(T}-*1JQ23l`}=7w
z?Lj*WDAZ@1Ny?P*hur0;M_~U>AkQx+(EX*1Kbw$u?WO&9ywwxjc>r+@su+vIKfUdT
z;DXc-!-QKl2BqX_=Jy{q#&u$tmo2d*=FOj;_QR136FHfqXUgvVrO-c1H;B1H;S!(G
z*}qfgPo$3B-5@Ab1biF%LiA=(0!vi|3KkZoDyMy_e8|e)K0iNSvIoc9@)YStB9Y9?
zUtAE@^7JGgQ4RuEzE1hpGhG}*0?o_i6co}g2zN!FJQuVi{N8zykKu=3|5E<{Wt4wW
z_@n2a+x(f`ABXZk-Jh2BGs3@CU5s~61w1)MZ*wOZ(47pRePuGsEosP^L!o6luC&+k
zg3bv=!X7voAXq3C_kC+G>SF;4Rfy0T(oJhtO7ey$#1(Z_Rh(`L_n*7cgF<}~TIZA%
g@7e5{+Mv?EuKLcra)MEg_IH8~tYvr$t#LQ%9}s8<P5=M^

literal 0
HcmV?d00001

diff --git a/examples/widgets/doc/src/eventtransitions.qdoc b/examples/widgets/doc/src/eventtransitions.qdoc
index 2c59d0863d5..4d332c0e00e 100644
--- a/examples/widgets/doc/src/eventtransitions.qdoc
+++ b/examples/widgets/doc/src/eventtransitions.qdoc
@@ -29,17 +29,29 @@
     \example statemachine/eventtransitions
     \title Event Transitions Example
 
-    \brief The Event Transitions example shows how to use event transitions, a
-    feature of \l{The State Machine Framework}.
+    \brief The Event Transitions example shows how to use event transitions,
+    a feature of \l{The State Machine Framework}.
+
+    The Event Transitions Example illustrates how states change when a
+    user enters or leaves the area of a button. The states are handled by
+    a QStateMachine object. The screen consists of a QVBoxLayout with a
+    central button.
+
+    When the mouse is outside the button, the text in the button displays
+    "Outside". When the mouse enters the button, it displays "Inside".
+
+    \borderedimage transitions.png
 
     \snippet statemachine/eventtransitions/main.cpp 0
 
     The \c Window class's constructors begins by creating a button.
+    This button is added to  \c layout, which is a QVBoxLayout object.
+    Then two states are created: \s1 is the state
+    "Outside", and \c s2 is the state "Inside".
 
     \snippet statemachine/eventtransitions/main.cpp 1
 
-    Two states, \c s1 and \c s2, are created; upon entry they will assign
-    "Outside" and "Inside" to the button's text, respectively.
+    State \c s1 is the state "Outside" and state \c s2 is state "Inside".
 
     \snippet statemachine/eventtransitions/main.cpp 2
 
@@ -54,11 +66,11 @@
 
     \snippet statemachine/eventtransitions/main.cpp 4
 
-    Next, the state \c s3 is created. \c s3 will be entered when the button
+    Next, state \c s3 is created. \c s3 will be entered when the button
     receives an event of type QEvent::MouseButtonPress and the state machine
     is in state \c s2. When the button receives an event of type
     QEvent::MouseButtonRelease and the state machine is in state \c s3, the
-    machine will transition back to state \c s2.
+    machine will revert to state \c s2.
 
     \snippet statemachine/eventtransitions/main.cpp 5
 
@@ -67,6 +79,7 @@
 
     \snippet statemachine/eventtransitions/main.cpp 6
 
-    The main() function constructs a Window object and shows it.
+    The main() function constructs a Window object that displays the QVBoxLayout
+    object \c layout with its \c button.
 
 */

From cb577004566e66c65bcdf53b5a84f0a41f039174 Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@qt.io>
Date: Thu, 8 Mar 2018 14:29:06 +0100
Subject: [PATCH 05/17] Doc: Update Find Files example

- review text
- update screenshot

Task-number: QTBUG-60635
Change-Id: I596ce0e08be9ed9aea7834eeda1c3c2c19c28d7a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
---
 doc/src/images/findfiles-example.png    | Bin 11219 -> 11174 bytes
 examples/widgets/doc/src/findfiles.qdoc | 103 +++++++++++++++---------
 2 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/doc/src/images/findfiles-example.png b/doc/src/images/findfiles-example.png
index acb5ea1abf1c5a82aa7ce1c4aefef894cd831ed2..cf3885c015348cdaf886fa186a9b9b2db4535375 100644
GIT binary patch
literal 11174
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
Q{uZG4Rz<E<=3~JB09%c=a{vGU

literal 11219
zcmZvCWmr`~)b6H1x({6k={VBeagY>LkVcU1ZWN@uyF&$O>6AlvDBX>ObR6Oyzx&m5
zpZjZ`J+o)en)R-jcg>E_R9C`%M)?c?09>fD{3`%J?g0QKElgxY5A7GBE&$-jgv!h4
zco`iodwWs$X7K)Pj6KeMS(GukR}VI>)$*faV>O`~*+AiOcB0RM#qSQv%F_Em>2F;m
zq*JLwIjc3y<dC7MOsLAdV21VTn3@_ayao}!HSHIPJchqT!gdahzb#DRnCR7p%tzNH
zep#J%xYjpxd<(A%$oqE1PbAwVMXnL|g%!jAS|?G^N`CTZF0jE=_(dF9$olMoC5<pz
z&Ogl1_vf+t-z!?~o;XV8{*P^V{E~6%TvIMN;n)!N11tqC5&;(Ht6h9ipPS5w!5!YD
zkA+sKqZ#>uX4%{*+<<g+laH(xiNYuy69Y`j64z{z@Z9kvos4)QtT6d*z(Siw2ET#A
z1P1BjbzzMx{NjU*#c=nFK+ho9$;wGBhNJ(Z&`ha0Gm;*ObqId1{<EHxjhTtGanD`R
zN&WtjG`#0wrjP=}M6x1=80>sdPDkRJthqn#Mv^wov<kmof_O6%(mbiX-=CV3-@kv~
z`E}@WUO6^C5vuq9YOwF+67paFje-4v^P{OM+d#K*bC()##ljNt%bImP)qmpjT3Krw
z9wfR_KX71i%m1FGUlMJ(HN)Smc5&74%$9qzZpEbTasN2R^ZNB`8eu1TVUHoS;Xt5F
z)Cm4NwLg&mB(f@X%;=}9%DRpx_vq*8+w;4DEVcv@IGmixR}G0SvD8-T-C<%k*Z60d
zJB+>~@>qwrBW}6+rS|r`vnNpmYD$>he~bQOe-?kEI(s{u6ELP&FBoR&jl}GJ?)y~)
zjj%H`t8Y!wJ9MveuS^W$yYqq!6eLr+AK#R>hsiY%B8^~<wQrQmtW2$}s3+$1dscE~
z{Ma%NGgs1bG4{4_KdoR^1vZ^R8=kI?Lra9@7RvEgNjo<5OYol2p>M>W!r>=3hq#T8
zOq*BuN<U)U+4P{%*ony*GmzepuDuf0$XXMk6#O^BD6N_Ep>kJG-glD@R|8i~*;1*!
zU9;S7##iOB<PHd<_YaiakS>3)@qdO6ItgP#Gc%*TYJpDG6SHMOj1I_3XhB)n7z=B<
zpzi(T+ZvoJ!Nq9oftCva>{6b9^RHqquC7#6RDW_?P7YkZ*)w5U^E_TjX|)|CX3>pC
zOU_C7!G}HDsDBj1>CR+7hXu9~1U!0j6ls-5M&bKD-IzaB#0>MTfB8*jK_k&N_fmSi
z#x98wrzowEbx61hYfT<=pR$HRh^tR{R~C7!8An%C`C2}@Xgz)<iAbZ3qB9^i%cRLU
z*LQ3=?CEj&lw=BoaqAGWbgiBF{w;a&y@-0^hrMv;?rrpTIAhrnS3ObbBxMn=baQ9p
zsb-ixWIz&+qE5=yc6xy{B_*Y|w>L2G@an)e5DO^T$<@{GseO8~&64Xgxh9C}>*ww$
z=%Rl}WpU^b-Yvatl&C5Fj`wAx{hCh_@UrtC7vam{JIC7Ia4NsuqKXhir|?$jdp#X<
zYD66~XX}{(%u`(ZM+f5&Dw3<Y=Ngxi3MXW2U}TN#uBtci#fK|$XKf2NhTpj*tDee@
z?ihQrh=HOx`&;xTg3l$2o0n0=Gs%S!!9Y|N5>4=Pz}m_vE!bp4gdB**&Vo!IKIr$!
zhF5BerxfdW;)Gr7@GdT!53+4BYg2o607ToeI5p^m^n^JrkUroOL>(f?Kh&(O*RZ6m
zf?0E}+?0T3()F!jc5-owbW;^`KyYa{(}LXiX}7gg-2FhuaQ0gKl<TR#D&Tlu?3>hW
zN^&m7i96K>ZTxY*=x50g0wnTOnTLhdABJZoemT+$pS;J+SO}2`6i7?@+$DTF8g1LM
zOyb6!hpEd#%^9zK26uOf;%kK*c0^rTT>_3fQ3>jZ+;Iy`tk(}CVh0~5u8pUJ`-aKA
z#yqccMW?8F*zrcP*Fd)X%lF^L)p(<+Gp?=A3~s`$O%3UzO_E=cC|IAw-nDa&Xc2MB
z6}h~}3<081kxfDt*<z&|F0KwE=r!`K(u*z0iY)%dpnVo-JjtgonWabXu-IprG)T;c
z^?=Bcn*bbX%-;fLbNoaviJ}ehdaB&T^xmSPt?8gLQGo4{ERl9tP)gBkxjSptf0TJ1
zFWvrl{bxn5wbpB@*?XFd506e*=x^77SbkiO7^Bp8vH4%o3a=WfG0nppjg9W3xWZ)p
zCST7!*m!$ao1HcIdKfi1^?kyoru_7qhAQ>JORiDNZFYz%mDJMJAOhmF)nZOz%B)Yu
z)p`Bp=mI_J?F#(l97W-+yZD1sx0#+I&{Zb&wAs$aq$z1JEs@9A0ZF*Dy;L|i-I|-W
zGjxePtzo=d=pd=JlNA7!AdKc+D<i1|+VeVlDluFdh7iaYC+oob<~loWxfru~zKjW+
z=aRh36IcL@XeUgC2X6;iddTb~j`qSE$iK2$w4T;yYLA+f!8g*`Z`v&AA(=W@(5OTI
zNTk*c?M)_%viKk_JVe3?vZX9QE#q8-^2?RI*$UYoQb_Lt1c{x<H1YhIFHI~hcWbLE
z=WcE!ex)#Pj<+vtS-Md*SX>{?)jV`I3h;cd#JTbgiMn<@(Z3uby!I9twm}szSN<aO
z>+Tsj9}iTjH_&aiRCDeA;MP^JBln$0GgH*&ho2^BDM$j(jQwoTeuAK&V%OAkvD`y-
zrz+x}lQ+wM6<NLVdmn!%`3g$FIe`(Cu}d3N#c*eD9dxlceYR;v!Cg#64n&4cjSUA9
zl=UbX$liyT!q605($If4WZ0F>#7l7HTGrqzk3;yCUBxc1G{-Z_<T48qyrwo}y|P7%
znbmBoFGkGVDv9S$2|m{oYoVja%h4EJqxN|z=t<&i<ZK>!8+kIi@G1;_UH>ErB1dK7
z4vMJLhYDB3su(OvetkyVV!kr+UB8ib-f6U~<6QX__D^3<yt2zno~4dTC3;~t%PY1V
z3Mq=vbXKXV(1T1a)?%!c9<1(t6YUww&cA-qPD|i<8X@8-xAsp2zXkT9TJ96tW2EM?
z>+Co)#hed+zS0%OwR8R5XPrb>^*+NF#O8+lignPwkE;)jkXMB*vd}H`eYW%PhZoiM
zro^#?8<<!OO$4>QW~#X<{^lBeD1zj2#k)5+drYgl^ZsA<ai;Y}3wyh%0VffDuknd}
ze2182<DFoBQ5e{dbxID)%;505V}@W22z^d_b>#EkrVCxpRNf7|1InhBgrTd0zOE<Y
zn*E5@3mtgHAKC<Fg`QO7*5%{<>9Ui6gD}$J6S1VP3DC6F<g)4R=e!_te>t#pXw&%K
zhe(-)HfqWO`5jUB%u8nr&=Hv?X2Nd)zRG!=vclY3wSHKj{qo}jv6_H(zmaH_&pOFd
z;rSANWqHZ_D3h)53|Vw;8a*6Vlx~xHM9kQa?Q158#vT#bjCLL&_z6%0A<B&d9t`k-
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

diff --git a/examples/widgets/doc/src/findfiles.qdoc b/examples/widgets/doc/src/findfiles.qdoc
index a2eb326519b..ad39b003ae3 100644
--- a/examples/widgets/doc/src/findfiles.qdoc
+++ b/examples/widgets/doc/src/findfiles.qdoc
@@ -30,43 +30,74 @@
     \title Find Files Example
     \ingroup examples-dialogs
 
-    \brief The Find Files example shows how to use QProgressDialog to provide
-    feedback on the progress of a slow operation. The example also
-    shows how to use QFileDialog to facilitate browsing, how to use
-    QTextStream's streaming operators to read a file, and how to use
-    QTableWidget to provide standard table display facilities for
-    applications. In addition, files can be opened using the
-    QDesktopServices class.
+    \brief A dialog for finding files in a specified folder
+
+    The Find Files application allows the user to search for files in a
+    specified directory, matching a given file name or wildcard,
+    and containing a specified string (if filled in). The search
+    result is displayed in a table containing the names of the files
+    and their sizes. The application also shows the number of files found.
+
+    The Find Files example illustrates the use of several classes:
+
+    \table
+    \row
+       \li QProgressDialog
+       \li Provide feedback on the progress of a search operation
+    \row
+       \li QFileDialog
+       \li Browse through a file list
+    \row
+       \li QTextStream
+       \li Use stream operators to read a file
+    \row
+       \li QTableWidget
+       \li Browse through the search results in a table
+    \row
+       \li QDesktopServices
+       \li Open files in the result list in a suitable application
+    \endtable
 
     \image findfiles-example.png Screenshot of the Find Files example
 
-    With the Find Files application the user can search for files in a
-    specified directory, matching a specified file name (using wild
-    cards if appropriate) and containing a specified text.
-
-    The user is provided with a \uicontrol Browse option, and the result of
-    the search is displayed in a table with the names of the files
-    found and their sizes. In addition the application provides a
-    total count of the files found.
 
     \section1 Window Class Definition
 
     The \c Window class inherits QWidget, and is the main application
-    widget. It shows the search options, and displays the search
+    widget. It shows the search options and displays the search
     results.
 
     \snippet dialogs/findfiles/window.h 0
 
-    We need two private slots: The \c browse() slot is called whenever
-    the user wants to browse for a directory to search in, and the \c
-    find() slot is called whenever the user requests a search to be
-    performed by pressing the \uicontrol Find button.
+    The application has two private slots:
+    \table
+    \row
+        \li The \c browse() slot
+        \li Called whenever the user wants to browse for a directory to search in
+    \row
+        \li The \c find() slot
+        \li Called whenever the user launches a search with the \uicontrol Find button
+    \endtable
 
-    In addition we declare several private functions: We use the \c
-    findFiles() function to search for files matching the user's
-    specifications, we call the \c showFiles() function to display the
-    results, and we use \c createButton(), \c createComboBox() and \c
-    createFilesTable() when we are constructing the widget.
+    In addition we declare several private functions:
+
+    \table
+        \row
+            \li findFiles()
+            \li Search for files matching the search parameters
+        \row
+            \li showFiles()
+            \li Display the search result
+        \row
+            \li ceateButton()
+            \li Construct the widget
+        \row
+            \li createComboBox()
+            \li Construct the widget
+        \row
+            \li createFilesTable()
+            \li Construct the widget
+    \endtable
 
     \section1 Window Class Implementation
 
@@ -103,11 +134,11 @@
     Here we use the static QFileDialog::getExistingDirectory()
     function which returns an existing directory selected by the
     user. Then we display the directory in the directory combobox
-    using the QComboBox::addItem() function, and updates the current
+    using the QComboBox::addItem() function and update the current
     index.
 
     QComboBox::addItem() adds an item to the combobox with the given
-    text (if it is not already present in the list), and containing
+    text (if not already present in the list), and containing
     the specified userData. The item is appended to the list of
     existing items.
 
@@ -118,13 +149,13 @@
 
     First we eliminate any previous search results by setting the
     table widgets row count to zero. Then we retrieve the
-    specified file name, text and directory path from the respective
+    specified file name, text, and directory path from the respective
     comboboxes.
 
     \snippet dialogs/findfiles/window.cpp 4
 
     We use the directory's path to create a QDir; the QDir class
-    provides access to directory structures and their contents.
+    provides access to the directory structure and its contents.
 
     We use QDirIterator to iterate over the files that match the
     specified file name and build a QStringList of paths.
@@ -144,15 +175,11 @@
     In the private \c findFiles() function we search through a list of
     files, looking for the ones that contain a specified text. This
     can be a very slow operation depending on the number of files as
-    well as their sizes. In case there are a large number of files, or
-    there exists some large files on the list, we provide a
-    QProgressDialog.
-
-    The QProgressDialog class provides feedback on the progress of a
-    slow operation. It is used to give the user an indication of how
-    long an operation is going to take, and to demonstrate that the
-    application has not frozen. It can also give the user an
-    opportunity to abort the operation.
+    well as their sizes. QProgressDialog displays a progress dialog
+    if the application has to search through a large number of files,
+    or if some of the files have a large size. QProgressDialog can
+    also allow the user to abort the operation if it takes too much
+    time.
 
     \snippet dialogs/findfiles/window.cpp 6
 

From 5c240f380aa936a4f0a781c035fcd148cd4b3720 Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@qt.io>
Date: Mon, 12 Mar 2018 16:51:01 +0100
Subject: [PATCH 06/17] Doc: Add brief statements to Address Book Example
 chapters

Task-number: QTBUG-60635
Change-Id: Ice6d2b6a475ba4352a87bb46366826334aed2af2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
---
 examples/widgets/doc/src/addressbook-tutorial.qdoc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/examples/widgets/doc/src/addressbook-tutorial.qdoc b/examples/widgets/doc/src/addressbook-tutorial.qdoc
index 31d1d64daca..1f6966e8aeb 100644
--- a/examples/widgets/doc/src/addressbook-tutorial.qdoc
+++ b/examples/widgets/doc/src/addressbook-tutorial.qdoc
@@ -80,7 +80,7 @@
 /*!
     \example tutorials/addressbook/part1
     \title Part 1 - Designing the User Interface
-
+    \brief Describes how to code the user interface of the Address Book Example.
     This first part covers the design of the basic graphical user
     interface (GUI) for our address book application.
 
@@ -232,6 +232,7 @@
 /*!
     \example tutorials/addressbook/part2
     \title Part 2 - Adding Addresses
+    \brief Describes the code for inserting records in the Address Book Example.
 
     The next step in creating the address book is to implement some
     user interactions.
@@ -381,9 +382,10 @@
 /*!
     \example tutorials/addressbook/part3
     \title Part 3 - Navigating between Entries
+    \brief Explains the code that enables navigating the contacts.
 
     The address book is now about half complete. We should add the
-    capability to navigate among the contacts, but first we must
+    capability to navigate the contacts, but first we must
     decide what sort of a data structure we need for containing these
     contacts.
 
@@ -496,6 +498,7 @@
 /*!
     \example tutorials/addressbook/part4
     \title Part 4 - Editing and Removing Addresses
+    \brief Explains how to add edit and remove functionality.
 
     Now we look at ways to modify the contents of contacts stored in
     the address book.
@@ -628,6 +631,7 @@
 /*!
     \example tutorials/addressbook/part5
     \title Part 5 - Adding a Find Function
+    \brief Describes how to add a find function.
 
     Here we look at ways to locate contacts and addresses in the
     address book.
@@ -770,6 +774,7 @@
 /*!
     \example tutorials/addressbook/part6
     \title Part 6 - Loading and Saving
+    \brief Describes how to add save and load functionality.
 
     This part covers the Qt file handling features we use to write
     loading and saving routines for the address book.
@@ -890,6 +895,7 @@
 /*!
     \example tutorials/addressbook/part7
     \title Part 7 - Additional Features
+    \brief Describes how to export data in VCard format.
 
     This part covers some additional features that make the address
     book more convenient for the frequent user.

From 5ffd47b76418eb4ef3369a78471cd6567c4659d0 Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@qt.io>
Date: Tue, 20 Mar 2018 10:41:04 +0100
Subject: [PATCH 07/17] Doc: Update connect syntax in I18n Widgets Example

Task-number: QTBUG-60635
Change-Id: Icfa0d09ac6c9ad4396fbe1138277bb1dd866a803
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
---
 examples/widgets/tools/i18n/languagechooser.cpp | 9 ++++++---
 examples/widgets/tools/i18n/mainwindow.cpp      | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/examples/widgets/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp
index 83aafe6b8a0..58cf9d4047f 100644
--- a/examples/widgets/tools/i18n/languagechooser.cpp
+++ b/examples/widgets/tools/i18n/languagechooser.cpp
@@ -70,7 +70,10 @@ LanguageChooser::LanguageChooser(const QString& defaultLang, QWidget *parent)
     for (int i = 0; i < qmFiles.size(); ++i) {
         QCheckBox *checkBox = new QCheckBox(languageName(qmFiles[i]));
         qmFileForCheckBoxMap.insert(checkBox, qmFiles[i]);
-        connect(checkBox, SIGNAL(toggled(bool)), this, SLOT(checkBoxToggled()));
+        connect(checkBox,
+                QOverload<bool>::of(&QCheckBox::toggled),
+                this,
+                &LanguageChooser::checkBoxToggled);
         if (languageMatch(defaultLang, qmFiles[i]))
                 checkBox->setCheckState(Qt::Checked);
         groupBoxLayout->addWidget(checkBox, i / 2, i % 2);
@@ -84,8 +87,8 @@ LanguageChooser::LanguageChooser(const QString& defaultLang, QWidget *parent)
     hideAllButton = buttonBox->addButton("Hide All",
                                          QDialogButtonBox::ActionRole);
 
-    connect(showAllButton, SIGNAL(clicked()), this, SLOT(showAll()));
-    connect(hideAllButton, SIGNAL(clicked()), this, SLOT(hideAll()));
+    connect(showAllButton, &QAbstractButton::clicked, this, &LanguageChooser::showAll);
+    connect(hideAllButton, &QAbstractButton::clicked, this, &LanguageChooser::hideAll);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addWidget(groupBox);
diff --git a/examples/widgets/tools/i18n/mainwindow.cpp b/examples/widgets/tools/i18n/mainwindow.cpp
index d5de81cab74..6ebfddfa98b 100644
--- a/examples/widgets/tools/i18n/mainwindow.cpp
+++ b/examples/widgets/tools/i18n/mainwindow.cpp
@@ -76,7 +76,7 @@ MainWindow::MainWindow()
     centralWidget->setLayout(mainLayout);
 
     exitAction = new QAction(tr("E&xit"), this);
-    connect(exitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(exitAction, &QAction::triggered, qApp, QApplication::quit);
 
     fileMenu = menuBar()->addMenu(tr("&File"));
     fileMenu->setPalette(QPalette(Qt::red));

From b451c9dfdc1421e202b5ce9c2e06931fc0c4c215 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Fri, 6 Apr 2018 14:37:22 +0200
Subject: [PATCH 08/17] tst_QTouchEvent: Wait for window exposed instead of
 active
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes the tests pass on Wayland compositors that don't automatically give
focus to newly created windows. Such as a headless Weston, which is very useful
for testing.

Task-number: QTBUG-66846
Change-Id: I502504b333499c89be193a3ebc19d41264a13580
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
---
 tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index d16d95500b6..db5e83e2c7c 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -608,7 +608,7 @@ void tst_QTouchEvent::basicRawEventTranslation()
     touchWidget.setAttribute(Qt::WA_AcceptTouchEvents);
     touchWidget.setGeometry(100, 100, 400, 300);
     touchWidget.show();
-    QVERIFY(QTest::qWaitForWindowActive(&touchWidget));
+    QVERIFY(QTest::qWaitForWindowExposed(&touchWidget));
 
     QPointF pos = touchWidget.rect().center();
     QPointF screenPos = touchWidget.mapToGlobal(pos.toPoint());
@@ -741,7 +741,7 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchScreen()
     rightWidget.setGeometry(300, 100, 100, 100);
 
     touchWidget.show();
-    QVERIFY(QTest::qWaitForWindowActive(&touchWidget));
+    QVERIFY(QTest::qWaitForWindowExposed(&touchWidget));
 
     QPointF leftPos = leftWidget.rect().center();
     QPointF rightPos = rightWidget.rect().center();
@@ -968,7 +968,7 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchPad()
     rightWidget.setGeometry(300, 100, 100, 100);
 
     touchWidget.show();
-    QVERIFY(QTest::qWaitForWindowActive(&touchWidget));
+    QVERIFY(QTest::qWaitForWindowExposed(&touchWidget));
 
     QPointF leftPos = leftWidget.rect().center();
     QPointF rightPos = rightWidget.rect().center();
@@ -1184,7 +1184,7 @@ void tst_QTouchEvent::basicRawEventTranslationOfIds()
     touchWidget.setAttribute(Qt::WA_AcceptTouchEvents);
     touchWidget.setGeometry(100, 100, 400, 300);
     touchWidget.show();
-    QVERIFY(QTest::qWaitForWindowActive(&touchWidget));
+    QVERIFY(QTest::qWaitForWindowExposed(&touchWidget));
 
     QVarLengthArray<QPointF, 2> pos;
     QVarLengthArray<QPointF, 2> screenPos;

From 1b109dbd917e7e4627177f375f17e60257486520 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Fri, 6 Apr 2018 12:50:02 +0200
Subject: [PATCH 09/17] tst_QClipboard: Skip on Wayland, as it requires real
 input events

On Wayland, manipulating the clipboard requires an input event serial, which is
not possible to get unless the compositor sends us input events.

Change-Id: If5231a5db85f8d6ad988ea93f240cee0c3466f9f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../gui/kernel/qclipboard/tst_qclipboard.cpp  | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
index 87fd5c0dc68..993ebbaac61 100644
--- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
@@ -41,10 +41,8 @@ class tst_QClipboard : public QObject
 {
     Q_OBJECT
 private slots:
-#ifdef QT_NO_CLIPBOARD
     void initTestCase();
-    void cleanupTestCase();
-#else
+#if QT_CONFIG(clipboard)
     void init();
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(Q_OS_QNX)
     void copy_exit_paste();
@@ -58,19 +56,16 @@ private slots:
 #endif
 };
 
-#ifdef QT_NO_CLIPBOARD
 void tst_QClipboard::initTestCase()
 {
+#if !QT_CONFIG(clipboard)
     QSKIP("This test requires clipboard support");
+#endif
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: Manipulating the clipboard requires real input events. Can't auto test.");
 }
 
-void tst_QClipboard::cleanupTestCase()
-{
-    QSKIP("This test requires clipboard support");
-}
-
-#else
-
+#if QT_CONFIG(clipboard)
 void tst_QClipboard::init()
 {
 #if QT_CONFIG(process)
@@ -436,7 +431,7 @@ void tst_QClipboard::clearBeforeSetText()
     QCOMPARE(QGuiApplication::clipboard()->text(), text);
 }
 
-#endif
+#endif // QT_CONFIG(clipboard)
 
 QTEST_MAIN(tst_QClipboard)
 

From 1c92bb87fe4d32265b3c6d33b6e548bd41635c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Tue, 20 Mar 2018 12:01:48 +0100
Subject: [PATCH 10/17] Fix TlsV1SslV3 case in the WinRT SSL backend

It would previously only enable TLS v1.0, but it should also enable
SSL v3. According to Microsoft's documentation[0] that is exactly what
"SocketProtectionLevel_Ssl" does.

[0]: https://docs.microsoft.com/en-us/uwp/api/windows.networking.sockets.socketprotectionlevel

Change-Id: Id48f1ad310d994b8379116c9fa2102db858d7f69
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 src/network/ssl/qsslsocket_winrt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp
index ff9dccc7349..53a8a8b61bc 100644
--- a/src/network/ssl/qsslsocket_winrt.cpp
+++ b/src/network/ssl/qsslsocket_winrt.cpp
@@ -236,9 +236,9 @@ void QSslSocketBackendPrivate::startClientEncryption()
     switch (q->protocol()) {
     case QSsl::AnyProtocol:
     case QSsl::SslV3:
+    case QSsl::TlsV1SslV3:
         protectionLevel = SocketProtectionLevel_Ssl; // Only use this value if weak cipher support is required
         break;
-    case QSsl::TlsV1SslV3:
     case QSsl::TlsV1_0:
         protectionLevel = SocketProtectionLevel_Tls10;
         break;

From f5a624c9b94455bebd7eb8fabbb300c4793fe6df Mon Sep 17 00:00:00 2001
From: Mikhail Svetkin <mikhail.svetkin@qt.io>
Date: Thu, 5 Apr 2018 15:08:15 +0200
Subject: [PATCH 11/17] Fix integer overflow (1 << 31)

On platforms where integer by default is int32(max is 2147483647) and
(1 << 31) will be 2147483648

Change-Id: I59ccb5344d5ad7d085f01bbc7cebdf6152ff7755
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/gui/text/qfontdatabase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 404a722e295..a4e51309374 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -2889,7 +2889,7 @@ Q_GUI_EXPORT QStringList qt_sort_families_by_writing_system(QChar::Script script
         uint order = i;
         if (testFamily == nullptr
               || (testFamily->writingSystems[writingSystem] & QtFontFamily::Supported) == 0) {
-            order |= 1 << 31;
+            order |= 1u << 31;
         }
 
         supported.insert(order, family);

From 5c4e5032b5162341168c1cec09f0247c7f2283e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Mon, 26 Mar 2018 15:19:17 +0200
Subject: [PATCH 12/17] Unblacklist qsslkey for Linux

Except RHEL-6.6 and 7.4

It was blacklisted in f3939d943ed132eaf3daead797d961c3ffbc31a5, along
with a lot of other entries. No specifics are known about why it was
blacklisted originally, but now it only fails on RHEL because they
use OpenSSL 1.0.1.

Change-Id: I6d1d1b7b7bf5386b2115b8780163550cf03bbad7
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 tests/auto/network/ssl/qsslkey/BLACKLIST | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST
index a08e1f35eb7..c0dfe5eb861 100644
--- a/tests/auto/network/ssl/qsslkey/BLACKLIST
+++ b/tests/auto/network/ssl/qsslkey/BLACKLIST
@@ -1 +1,2 @@
-linux
+redhatenterpriselinuxworkstation-6.6
+rhel-7.4

From 37161d038061584227fe29b9c808acfcc8e865ee Mon Sep 17 00:00:00 2001
From: Paul Wicking <paul.wicking@qt.io>
Date: Wed, 21 Mar 2018 15:10:33 +0100
Subject: [PATCH 13/17] Doc: Update QVariant::toString description, update see
 also links
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change the toString description to reflect that the listed types are not
exclusive, and update see also link to link to the canConvert method
that includes conversion table.

Task-number: QTBUG-67174
Change-Id: I3ad2889c98a235995b94a2d0496a6fb8c024b7bb
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 src/corelib/kernel/qvariant.cpp | 91 +++++++++++++++++----------------
 1 file changed, 48 insertions(+), 43 deletions(-)

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index b3a86576aff..6192b664871 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2379,7 +2379,7 @@ inline T qVariantToHelper(const QVariant::Private &d, const HandlersManager &han
     \l QMetaType::QVariantList of a type that can be converted to QString;
     otherwise returns an empty list.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QStringList QVariant::toStringList() const
 {
@@ -2387,14 +2387,19 @@ QStringList QVariant::toStringList() const
 }
 
 /*!
-    Returns the variant as a QString if the variant has userType() \l
-    QMetaType::QString, \l QMetaType::Bool, \l QMetaType::QByteArray,
+    Returns the variant as a QString if the variant has a userType()
+    including, but not limited to:
+
+    \l QMetaType::QString, \l QMetaType::Bool, \l QMetaType::QByteArray,
     \l QMetaType::QChar, \l QMetaType::QDate, \l QMetaType::QDateTime,
     \l QMetaType::Double, \l QMetaType::Int, \l QMetaType::LongLong,
     \l QMetaType::QStringList, \l QMetaType::QTime, \l QMetaType::UInt, or
-    \l QMetaType::ULongLong; otherwise returns an empty string.
+    \l QMetaType::ULongLong.
 
-    \sa canConvert(), convert()
+    Calling QVariant::toString() on an unsupported variant returns an empty
+    string.
+
+    \sa canConvert(int targetTypeId), convert()
 */
 QString QVariant::toString() const
 {
@@ -2405,7 +2410,7 @@ QString QVariant::toString() const
     Returns the variant as a QMap<QString, QVariant> if the variant
     has type() \l QMetaType::QVariantMap; otherwise returns an empty map.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QVariantMap QVariant::toMap() const
 {
@@ -2416,7 +2421,7 @@ QVariantMap QVariant::toMap() const
     Returns the variant as a QHash<QString, QVariant> if the variant
     has type() \l QMetaType::QVariantHash; otherwise returns an empty map.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QVariantHash QVariant::toHash() const
 {
@@ -2433,7 +2438,7 @@ QVariantHash QVariant::toHash() const
     If the type() is \l QMetaType::QString, an invalid date will be returned if
     the string cannot be parsed as a Qt::ISODate format date.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QDate QVariant::toDate() const
 {
@@ -2450,7 +2455,7 @@ QDate QVariant::toDate() const
     If the type() is \l QMetaType::QString, an invalid time will be returned if
     the string cannot be parsed as a Qt::ISODate format time.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QTime QVariant::toTime() const
 {
@@ -2467,7 +2472,7 @@ QTime QVariant::toTime() const
     If the type() is \l QMetaType::QString, an invalid date/time will be
     returned if the string cannot be parsed as a Qt::ISODate format date/time.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QDateTime QVariant::toDateTime() const
 {
@@ -2481,7 +2486,7 @@ QDateTime QVariant::toDateTime() const
     Returns the variant as a QEasingCurve if the variant has userType()
     \l QMetaType::QEasingCurve; otherwise returns a default easing curve.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 #ifndef QT_BOOTSTRAPPED
 QEasingCurve QVariant::toEasingCurve() const
@@ -2497,7 +2502,7 @@ QEasingCurve QVariant::toEasingCurve() const
     \l QMetaType::QByteArray or \l QMetaType::QString (converted using
     QString::fromUtf8()); otherwise returns an empty byte array.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QByteArray QVariant::toByteArray() const
 {
@@ -2512,7 +2517,7 @@ QByteArray QVariant::toByteArray() const
     \l QMetaType::QPoint or \l QMetaType::QPointF; otherwise returns a null
     QPoint.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QPoint QVariant::toPoint() const
 {
@@ -2525,7 +2530,7 @@ QPoint QVariant::toPoint() const
     Returns the variant as a QRect if the variant has userType()
     \l QMetaType::QRect; otherwise returns an invalid QRect.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QRect QVariant::toRect() const
 {
@@ -2538,7 +2543,7 @@ QRect QVariant::toRect() const
     Returns the variant as a QSize if the variant has userType()
     \l QMetaType::QSize; otherwise returns an invalid QSize.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QSize QVariant::toSize() const
 {
@@ -2551,7 +2556,7 @@ QSize QVariant::toSize() const
     Returns the variant as a QSizeF if the variant has userType() \l
     QMetaType::QSizeF; otherwise returns an invalid QSizeF.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QSizeF QVariant::toSizeF() const
 {
@@ -2565,7 +2570,7 @@ QSizeF QVariant::toSizeF() const
     \l QMetaType::QRect or \l QMetaType::QRectF; otherwise returns an invalid
     QRectF.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QRectF QVariant::toRectF() const
 {
@@ -2578,7 +2583,7 @@ QRectF QVariant::toRectF() const
     Returns the variant as a QLineF if the variant has userType()
     \l QMetaType::QLineF; otherwise returns an invalid QLineF.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QLineF QVariant::toLineF() const
 {
@@ -2591,7 +2596,7 @@ QLineF QVariant::toLineF() const
     Returns the variant as a QLine if the variant has userType()
     \l QMetaType::QLine; otherwise returns an invalid QLine.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QLine QVariant::toLine() const
 {
@@ -2605,7 +2610,7 @@ QLine QVariant::toLine() const
     QMetaType::QPoint or \l QMetaType::QPointF; otherwise returns a null
     QPointF.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QPointF QVariant::toPointF() const
 {
@@ -2621,7 +2626,7 @@ QPointF QVariant::toPointF() const
     Returns the variant as a QUrl if the variant has userType()
     \l QMetaType::QUrl; otherwise returns an invalid QUrl.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QUrl QVariant::toUrl() const
 {
@@ -2635,7 +2640,7 @@ QUrl QVariant::toUrl() const
     Returns the variant as a QLocale if the variant has userType()
     \l QMetaType::QLocale; otherwise returns an invalid QLocale.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QLocale QVariant::toLocale() const
 {
@@ -2649,7 +2654,7 @@ QLocale QVariant::toLocale() const
     Returns the variant as a QRegExp if the variant has userType()
     \l QMetaType::QRegExp; otherwise returns an empty QRegExp.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 #ifndef QT_NO_REGEXP
 QRegExp QVariant::toRegExp() const
@@ -2666,7 +2671,7 @@ QRegExp QVariant::toRegExp() const
     Returns the variant as a QRegularExpression if the variant has userType() \l
     QRegularExpression; otherwise returns an empty QRegularExpression.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QRegularExpression QVariant::toRegularExpression() const
 {
@@ -2681,7 +2686,7 @@ QRegularExpression QVariant::toRegularExpression() const
     Returns the variant as a QModelIndex if the variant has userType() \l
     QModelIndex; otherwise returns a default constructed QModelIndex.
 
-    \sa canConvert(), convert(), toPersistentModelIndex()
+    \sa canConvert(int targetTypeId), convert(), toPersistentModelIndex()
 */
 QModelIndex QVariant::toModelIndex() const
 {
@@ -2694,7 +2699,7 @@ QModelIndex QVariant::toModelIndex() const
     Returns the variant as a QPersistentModelIndex if the variant has userType() \l
     QPersistentModelIndex; otherwise returns a default constructed QPersistentModelIndex.
 
-    \sa canConvert(), convert(), toModelIndex()
+    \sa canConvert(int targetTypeId), convert(), toModelIndex()
 */
 QPersistentModelIndex QVariant::toPersistentModelIndex() const
 {
@@ -2710,7 +2715,7 @@ QPersistentModelIndex QVariant::toPersistentModelIndex() const
     \l QMetaType::QUuid, \l QMetaType::QByteArray or \l QMetaType::QString;
     otherwise returns a default-constructed QUuid.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QUuid QVariant::toUuid() const
 {
@@ -2723,7 +2728,7 @@ QUuid QVariant::toUuid() const
     Returns the variant as a QJsonValue if the variant has userType() \l
     QJsonValue; otherwise returns a default constructed QJsonValue.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QJsonValue QVariant::toJsonValue() const
 {
@@ -2736,7 +2741,7 @@ QJsonValue QVariant::toJsonValue() const
     Returns the variant as a QJsonObject if the variant has userType() \l
     QJsonObject; otherwise returns a default constructed QJsonObject.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QJsonObject QVariant::toJsonObject() const
 {
@@ -2749,7 +2754,7 @@ QJsonObject QVariant::toJsonObject() const
     Returns the variant as a QJsonArray if the variant has userType() \l
     QJsonArray; otherwise returns a default constructed QJsonArray.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QJsonArray QVariant::toJsonArray() const
 {
@@ -2762,7 +2767,7 @@ QJsonArray QVariant::toJsonArray() const
     Returns the variant as a QJsonDocument if the variant has userType() \l
     QJsonDocument; otherwise returns a default constructed QJsonDocument.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QJsonDocument QVariant::toJsonDocument() const
 {
@@ -2777,7 +2782,7 @@ QJsonDocument QVariant::toJsonDocument() const
     \l QMetaType::QChar, \l QMetaType::Int, or \l QMetaType::UInt; otherwise
     returns an invalid QChar.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QChar QVariant::toChar() const
 {
@@ -2788,7 +2793,7 @@ QChar QVariant::toChar() const
     Returns the variant as a QBitArray if the variant has userType()
     \l QMetaType::QBitArray; otherwise returns an empty bit array.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QBitArray QVariant::toBitArray() const
 {
@@ -2831,7 +2836,7 @@ inline T qNumVariantToHelper(const QVariant::Private &d,
     will not be reflected in \a ok. A simple workaround is to use
     QString::toInt().
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 int QVariant::toInt(bool *ok) const
 {
@@ -2853,7 +2858,7 @@ int QVariant::toInt(bool *ok) const
     overflow will not be reflected in \a ok. A simple workaround is to use
     QString::toUInt().
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 uint QVariant::toUInt(bool *ok) const
 {
@@ -2870,7 +2875,7 @@ uint QVariant::toUInt(bool *ok) const
     If \a ok is non-null: \c{*}\c{ok} is set to true if the value could be
     converted to an int; otherwise \c{*}\c{ok} is set to false.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 qlonglong QVariant::toLongLong(bool *ok) const
 {
@@ -2887,7 +2892,7 @@ qlonglong QVariant::toLongLong(bool *ok) const
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to an int; otherwise \c{*}\a{ok} is set to false.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 qulonglong QVariant::toULongLong(bool *ok) const
 {
@@ -2904,7 +2909,7 @@ qulonglong QVariant::toULongLong(bool *ok) const
     \l QMetaType::QByteArray and its lower-case content is not one of the
     following: empty, "0" or "false"; otherwise returns \c false.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 bool QVariant::toBool() const
 {
@@ -2927,7 +2932,7 @@ bool QVariant::toBool() const
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to a double; otherwise \c{*}\a{ok} is set to false.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 double QVariant::toDouble(bool *ok) const
 {
@@ -2946,7 +2951,7 @@ double QVariant::toDouble(bool *ok) const
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to a double; otherwise \c{*}\a{ok} is set to false.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 float QVariant::toFloat(bool *ok) const
 {
@@ -2965,7 +2970,7 @@ float QVariant::toFloat(bool *ok) const
     If \a ok is non-null: \c{*}\a{ok} is set to true if the value could be
     converted to a double; otherwise \c{*}\a{ok} is set to false.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 qreal QVariant::toReal(bool *ok) const
 {
@@ -2977,7 +2982,7 @@ qreal QVariant::toReal(bool *ok) const
     \l QMetaType::QVariantList or \l QMetaType::QStringList; otherwise returns
     an empty list.
 
-    \sa canConvert(), convert()
+    \sa canConvert(int targetTypeId), convert()
 */
 QVariantList QVariant::toList() const
 {
@@ -3359,7 +3364,7 @@ bool QVariant::canConvert(int targetTypeId) const
     failed a previous conversion will always fail, changing the type, remaining null,
     and returning \c false.
 
-    \sa canConvert(), clear()
+    \sa canConvert(int targetTypeId), clear()
 */
 
 bool QVariant::convert(int targetTypeId)

From fe19527a4347dfbf39bc9073ff26a9f5a28930c0 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 1 Nov 2017 14:21:21 +0200
Subject: [PATCH 14/17] Configure: Restore default prefix on Windows

The configure unification accidentally changed it to /usr/local as used on
unix. Use C:/Qt again.

Task-number: QTBUG-61373
Change-Id: I758c639bdb07c97b55f990821e73a5135038f4a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 configure.pri | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.pri b/configure.pri
index 7185647e44a..0512ef01447 100644
--- a/configure.pri
+++ b/configure.pri
@@ -694,10 +694,14 @@ defineReplace(printHostPaths) {
 
 defineTest(qtConfOutput_preparePaths) {
     isEmpty(config.input.prefix) {
-        $$qtConfEvaluate("features.developer-build"): \
+        $$qtConfEvaluate("features.developer-build") {
             config.input.prefix = $$QT_BUILD_TREE  # In Development, we use sandboxed builds by default
-        else: \
-            config.input.prefix = /usr/local/Qt-$$[QT_VERSION]
+        } else {
+            win32: \
+                config.input.prefix = C:/Qt/Qt-$$[QT_VERSION]
+            else: \
+                config.input.prefix = /usr/local/Qt-$$[QT_VERSION]
+        }
         have_prefix = false
     } else {
         config.input.prefix = $$absolute_path($$config.input.prefix, $$OUT_PWD)

From 315327f3d6419d2689d3414d62012d65fe441f27 Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@qt.io>
Date: Thu, 15 Mar 2018 16:33:20 +0100
Subject: [PATCH 15/17] xcb: rename two classes in qxcbbackingstore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QXcbShmImage to QXcbBackingStoreImage as it is an image that
might or might not have SHM capability. The current name implies
that it always uses SHM.

QXcbShmGraphicsBuffer to QXcbGraphicsBuffer as it has nothing to
do with SHM.

Change-Id: I57ced75891e8b10515142769278a7f3f40da91ef
Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Błażej Szczygieł <spaz16@wp.pl>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 .../platforms/xcb/qxcbbackingstore.cpp        | 42 +++++++++----------
 src/plugins/platforms/xcb/qxcbbackingstore.h  |  4 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
index 70d1757af46..6efdb2d8344 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
@@ -70,11 +70,11 @@
 
 QT_BEGIN_NAMESPACE
 
-class QXcbShmImage : public QXcbObject
+class QXcbBackingStoreImage : public QXcbObject
 {
 public:
-    QXcbShmImage(QXcbScreen *connection, const QSize &size, uint depth, QImage::Format format);
-    ~QXcbShmImage() { destroy(true); }
+    QXcbBackingStoreImage(QXcbScreen *connection, const QSize &size, uint depth, QImage::Format format);
+    ~QXcbBackingStoreImage() { destroy(true); }
 
     void resize(const QSize &size);
 
@@ -140,10 +140,10 @@ private:
     bool m_clientSideScroll;
 };
 
-class QXcbShmGraphicsBuffer : public QPlatformGraphicsBuffer
+class QXcbGraphicsBuffer : public QPlatformGraphicsBuffer
 {
 public:
-    QXcbShmGraphicsBuffer(QImage *image)
+    QXcbGraphicsBuffer(QImage *image)
         : QPlatformGraphicsBuffer(image->size(), QImage::toPixelFormat(image->format()))
         , m_access_lock(QPlatformGraphicsBuffer::None)
         , m_image(image)
@@ -175,7 +175,7 @@ static inline size_t imageDataSize(const xcb_image_t *image)
     return static_cast<size_t>(image->stride) * image->height;
 }
 
-QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QImage::Format format)
+QXcbBackingStoreImage::QXcbBackingStoreImage(QXcbScreen *screen, const QSize &size, uint depth, QImage::Format format)
     : QXcbObject(screen->connection())
     , m_screen_root(screen->screen()->root)
     , m_segmentSize(0)
@@ -196,7 +196,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI
     create(size, fmt, format);
 }
 
-void QXcbShmImage::resize(const QSize &size)
+void QXcbBackingStoreImage::resize(const QSize &size)
 {
     xcb_format_t fmt;
     fmt.depth = m_xcb_image->depth;
@@ -207,7 +207,7 @@ void QXcbShmImage::resize(const QSize &size)
     create(size, &fmt, m_qimage.format());
 }
 
-void QXcbShmImage::create(const QSize &size, const xcb_format_t *fmt, QImage::Format format)
+void QXcbBackingStoreImage::create(const QSize &size, const xcb_format_t *fmt, QImage::Format format)
 {
     m_xcb_image = xcb_image_create(size.width(), size.height(),
                                    XCB_IMAGE_FORMAT_Z_PIXMAP,
@@ -232,7 +232,7 @@ void QXcbShmImage::create(const QSize &size, const xcb_format_t *fmt, QImage::Fo
     m_xcb_image->data = m_shm_info.shmaddr ? m_shm_info.shmaddr : (uint8_t *)malloc(segmentSize);
 
     m_qimage = QImage( (uchar*) m_xcb_image->data, m_xcb_image->width, m_xcb_image->height, m_xcb_image->stride, format);
-    m_graphics_buffer = new QXcbShmGraphicsBuffer(&m_qimage);
+    m_graphics_buffer = new QXcbGraphicsBuffer(&m_qimage);
 
     m_xcb_pixmap = xcb_generate_id(xcb_connection());
     xcb_create_pixmap(xcb_connection(),
@@ -242,7 +242,7 @@ void QXcbShmImage::create(const QSize &size, const xcb_format_t *fmt, QImage::Fo
                       m_xcb_image->width, m_xcb_image->height);
 }
 
-void QXcbShmImage::destroy(bool destroyShm)
+void QXcbBackingStoreImage::destroy(bool destroyShm)
 {
     if (m_xcb_image->data) {
         if (m_shm_info.shmaddr) {
@@ -268,7 +268,7 @@ void QXcbShmImage::destroy(bool destroyShm)
     m_xcb_pixmap = 0;
 }
 
-void QXcbShmImage::flushScrolledRegion(bool clientSideScroll)
+void QXcbBackingStoreImage::flushScrolledRegion(bool clientSideScroll)
 {
     if (m_clientSideScroll == clientSideScroll)
        return;
@@ -316,7 +316,7 @@ void QXcbShmImage::flushScrolledRegion(bool clientSideScroll)
     }
 }
 
-void QXcbShmImage::createShmSegment(size_t segmentSize)
+void QXcbBackingStoreImage::createShmSegment(size_t segmentSize)
 {
     Q_ASSERT(connection()->hasShm());
     Q_ASSERT(m_segmentSize == 0);
@@ -400,7 +400,7 @@ void QXcbShmImage::createShmSegment(size_t segmentSize)
     }
 }
 
-void QXcbShmImage::destroyShmSegment(size_t segmentSize)
+void QXcbBackingStoreImage::destroyShmSegment(size_t segmentSize)
 {
 #ifndef XCB_USE_SHM_FD
     Q_UNUSED(segmentSize)
@@ -433,7 +433,7 @@ void QXcbShmImage::destroyShmSegment(size_t segmentSize)
 
 extern void qt_scrollRectInImage(QImage &img, const QRect &rect, const QPoint &offset);
 
-bool QXcbShmImage::scroll(const QRegion &area, int dx, int dy)
+bool QXcbBackingStoreImage::scroll(const QRegion &area, int dx, int dy)
 {
     const QRect bounds(QPoint(), size());
     const QRegion scrollArea(area & bounds);
@@ -477,7 +477,7 @@ bool QXcbShmImage::scroll(const QRegion &area, int dx, int dy)
     return true;
 }
 
-void QXcbShmImage::ensureGC(xcb_drawable_t dst)
+void QXcbBackingStoreImage::ensureGC(xcb_drawable_t dst)
 {
     if (m_gc_drawable != dst) {
         if (m_gc)
@@ -557,7 +557,7 @@ static inline quint32 round_up_scanline(quint32 base, quint32 pad)
     return (base + pad - 1) & -pad;
 }
 
-void QXcbShmImage::shmPutImage(xcb_drawable_t drawable, const QRegion &region, const QPoint &offset)
+void QXcbBackingStoreImage::shmPutImage(xcb_drawable_t drawable, const QRegion &region, const QPoint &offset)
 {
     for (const QRect &rect : region) {
         const QPoint source = rect.translated(offset).topLeft();
@@ -578,7 +578,7 @@ void QXcbShmImage::shmPutImage(xcb_drawable_t drawable, const QRegion &region, c
     m_dirtyShm |= region.translated(offset);
 }
 
-void QXcbShmImage::flushPixmap(const QRegion &region, bool fullRegion)
+void QXcbBackingStoreImage::flushPixmap(const QRegion &region, bool fullRegion)
 {
     if (!fullRegion) {
         auto actualRegion = m_pendingFlush.intersected(region);
@@ -647,7 +647,7 @@ void QXcbShmImage::flushPixmap(const QRegion &region, bool fullRegion)
     }
 }
 
-void QXcbShmImage::setClip(const QRegion &region)
+void QXcbBackingStoreImage::setClip(const QRegion &region)
 {
     if (region.isEmpty()) {
         static const uint32_t mask = XCB_GC_CLIP_MASK;
@@ -663,7 +663,7 @@ void QXcbShmImage::setClip(const QRegion &region)
     }
 }
 
-void QXcbShmImage::put(xcb_drawable_t dst, const QRegion &region, const QPoint &offset)
+void QXcbBackingStoreImage::put(xcb_drawable_t dst, const QRegion &region, const QPoint &offset)
 {
     Q_ASSERT(!m_clientSideScroll);
 
@@ -704,7 +704,7 @@ void QXcbShmImage::put(xcb_drawable_t dst, const QRegion &region, const QPoint &
     setClip(QRegion());
 }
 
-void QXcbShmImage::preparePaint(const QRegion &region)
+void QXcbBackingStoreImage::preparePaint(const QRegion &region)
 {
     if (hasShm()) {
         // to prevent X from reading from the image region while we're writing to it
@@ -860,7 +860,7 @@ void QXcbBackingStore::resize(const QSize &size, const QRegion &)
         m_image->resize(size);
     } else {
         QXcbScreen *screen = static_cast<QXcbScreen *>(window()->screen()->handle());
-        m_image = new QXcbShmImage(screen, size, win->depth(), win->imageFormat());
+        m_image = new QXcbBackingStoreImage(screen, size, win->depth(), win->imageFormat());
     }
 
     // Slow path for bgr888 VNC: Create an additional image, paint into that and
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.h b/src/plugins/platforms/xcb/qxcbbackingstore.h
index 2e8fbfb7faf..f40030001b5 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.h
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.h
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QXcbShmImage;
+class QXcbBackingStoreImage;
 
 class QXcbBackingStore : public QXcbObject, public QPlatformBackingStore
 {
@@ -75,7 +75,7 @@ public:
     void endPaint() override;
 
 private:
-    QXcbShmImage *m_image;
+    QXcbBackingStoreImage *m_image;
     QStack<QRegion> m_paintRegions;
     QImage m_rgbImage;
 };

From 89ab15ac913de09ca46b123776dfb2cdbf84a13b Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@qt.io>
Date: Thu, 15 Mar 2018 17:45:02 +0100
Subject: [PATCH 16/17] xcb: various coding style cleanups in qxcbbackingstore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Pass QXcbBackingStoreImage a pointer to QXcbBackingStore. This
allow for simpler QXcbBackingStoreImage ctor.

- Use member initializers.

Change-Id: Ia992390060bb30e1184813cd0d115a8bf0fbc237
Reviewed-by: Błażej Szczygieł <spaz16@wp.pl>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 .../platforms/xcb/qxcbbackingstore.cpp        | 66 +++++++++----------
 src/plugins/platforms/xcb/qxcbbackingstore.h  |  2 +-
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
index 6efdb2d8344..659d1c53cb0 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
@@ -70,10 +70,12 @@
 
 QT_BEGIN_NAMESPACE
 
+class QXcbBackingStore;
+
 class QXcbBackingStoreImage : public QXcbObject
 {
 public:
-    QXcbBackingStoreImage(QXcbScreen *connection, const QSize &size, uint depth, QImage::Format format);
+    QXcbBackingStoreImage(QXcbBackingStore *backingStore, const QSize &size);
     ~QXcbBackingStoreImage() { destroy(true); }
 
     void resize(const QSize &size);
@@ -105,25 +107,24 @@ private:
     void flushPixmap(const QRegion &region, bool fullRegion = false);
     void setClip(const QRegion &region);
 
-    xcb_window_t m_screen_root;
-
     xcb_shm_segment_info_t m_shm_info;
-    size_t m_segmentSize;
+    QXcbBackingStore *m_backingStore = nullptr;
+    size_t m_segmentSize = 0;
 
-    xcb_image_t *m_xcb_image;
+    xcb_image_t *m_xcb_image = nullptr;
 
     QImage m_qimage;
-    QPlatformGraphicsBuffer *m_graphics_buffer;
+    QPlatformGraphicsBuffer *m_graphics_buffer = nullptr;
 
-    xcb_gcontext_t m_gc;
-    xcb_drawable_t m_gc_drawable;
+    xcb_gcontext_t m_gc = 0;
+    xcb_drawable_t m_gc_drawable = 0;
 
     // When using shared memory these variables are used only for server-side scrolling.
     // When not using shared memory, we maintain a server-side pixmap with the backing
     // store as well as repainted content not yet flushed to the pixmap. We only flush
     // the regions we need and only when these are marked dirty. This way we can just
     // do a server-side copy on expose instead of sending the pixels every time
-    xcb_pixmap_t m_xcb_pixmap;
+    xcb_pixmap_t m_xcb_pixmap = 0;
     QRegion m_pendingFlush;
 
     // This is the scrolled region which is stored in server-side pixmap
@@ -136,8 +137,8 @@ private:
     // as a pixmap region to server
     QByteArray m_flushBuffer;
 
-    bool m_hasAlpha;
-    bool m_clientSideScroll;
+    bool m_hasAlpha = false;
+    bool m_clientSideScroll = false;
 };
 
 class QXcbGraphicsBuffer : public QPlatformGraphicsBuffer
@@ -145,7 +146,6 @@ class QXcbGraphicsBuffer : public QPlatformGraphicsBuffer
 public:
     QXcbGraphicsBuffer(QImage *image)
         : QPlatformGraphicsBuffer(image->size(), QImage::toPixelFormat(image->format()))
-        , m_access_lock(QPlatformGraphicsBuffer::None)
         , m_image(image)
     { }
 
@@ -165,9 +165,10 @@ public:
     int bytesPerLine() const override { return m_image->bytesPerLine(); }
 
     Origin origin() const override { return QPlatformGraphicsBuffer::OriginTopLeft; }
+
 private:
-    AccessTypes m_access_lock;
-    QImage *m_image;
+    AccessTypes m_access_lock = QPlatformGraphicsBuffer::None;
+    QImage *m_image = nullptr;
 };
 
 static inline size_t imageDataSize(const xcb_image_t *image)
@@ -175,25 +176,22 @@ static inline size_t imageDataSize(const xcb_image_t *image)
     return static_cast<size_t>(image->stride) * image->height;
 }
 
-QXcbBackingStoreImage::QXcbBackingStoreImage(QXcbScreen *screen, const QSize &size, uint depth, QImage::Format format)
-    : QXcbObject(screen->connection())
-    , m_screen_root(screen->screen()->root)
-    , m_segmentSize(0)
-    , m_graphics_buffer(nullptr)
-    , m_gc(0)
-    , m_gc_drawable(0)
-    , m_xcb_pixmap(0)
-    , m_clientSideScroll(false)
+QXcbBackingStoreImage::QXcbBackingStoreImage(QXcbBackingStore *backingStore, const QSize &size)
+    : QXcbObject(backingStore->connection())
+    , m_backingStore(backingStore)
 {
-    const xcb_format_t *fmt = connection()->formatForDepth(depth);
+    QXcbWindow *window = static_cast<QXcbWindow *>(backingStore->window()->handle());
+    const xcb_format_t *fmt = connection()->formatForDepth(window->depth());
     Q_ASSERT(fmt);
 
+    memset(&m_shm_info, 0, sizeof m_shm_info);
+
+    QImage::Format format = window->imageFormat();
     m_hasAlpha = QImage::toPixelFormat(format).alphaUsage() == QPixelFormat::UsesAlpha;
     if (!m_hasAlpha)
-        format = qt_maybeAlphaVersionWithSameDepth(format);
-
-    memset(&m_shm_info, 0, sizeof m_shm_info);
-    create(size, fmt, format);
+        create(size, fmt, qt_maybeAlphaVersionWithSameDepth(format));
+    else
+        create(size, fmt, format);
 }
 
 void QXcbBackingStoreImage::resize(const QSize &size)
@@ -235,10 +233,11 @@ void QXcbBackingStoreImage::create(const QSize &size, const xcb_format_t *fmt, Q
     m_graphics_buffer = new QXcbGraphicsBuffer(&m_qimage);
 
     m_xcb_pixmap = xcb_generate_id(xcb_connection());
+    auto xcbScreen = static_cast<QXcbScreen *>(m_backingStore->window()->screen()->handle());
     xcb_create_pixmap(xcb_connection(),
                       m_xcb_image->depth,
                       m_xcb_pixmap,
-                      m_screen_root,
+                      xcbScreen->root(),
                       m_xcb_image->width, m_xcb_image->height);
 }
 
@@ -719,7 +718,6 @@ void QXcbBackingStoreImage::preparePaint(const QRegion &region)
 
 QXcbBackingStore::QXcbBackingStore(QWindow *window)
     : QPlatformBackingStore(window)
-    , m_image(0)
 {
     QXcbScreen *screen = static_cast<QXcbScreen *>(window->screen()->handle());
     setConnection(screen->connection());
@@ -856,12 +854,10 @@ void QXcbBackingStore::resize(const QSize &size, const QRegion &)
     }
     QXcbWindow* win = static_cast<QXcbWindow *>(pw);
 
-    if (m_image) {
+    if (m_image)
         m_image->resize(size);
-    } else {
-        QXcbScreen *screen = static_cast<QXcbScreen *>(window()->screen()->handle());
-        m_image = new QXcbBackingStoreImage(screen, size, win->depth(), win->imageFormat());
-    }
+    else
+        m_image = new QXcbBackingStoreImage(this, size);
 
     // Slow path for bgr888 VNC: Create an additional image, paint into that and
     // swap R and B while copying to m_image after each paint.
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.h b/src/plugins/platforms/xcb/qxcbbackingstore.h
index f40030001b5..747626c2130 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.h
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.h
@@ -75,7 +75,7 @@ public:
     void endPaint() override;
 
 private:
-    QXcbBackingStoreImage *m_image;
+    QXcbBackingStoreImage *m_image = nullptr;
     QStack<QRegion> m_paintRegions;
     QImage m_rgbImage;
 };

From 3b85d53913741660473dbc242a48c2ee65d51421 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Date: Thu, 29 Mar 2018 17:12:36 -0700
Subject: [PATCH 17/17] macx-clang: Update informal documentation for xcb build

Remove references to XKB and explain what to do if
pkg-config is missing or unwanted.

Change-Id: I099bf01ff49e1b8f6e822a50f0fe4904965a7a9f
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 mkspecs/macx-clang/qmake.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf
index 170464d08fc..14c885fd785 100644
--- a/mkspecs/macx-clang/qmake.conf
+++ b/mkspecs/macx-clang/qmake.conf
@@ -11,13 +11,16 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64
 # configure \
 #   -pkg-config \
 #   -fontconfig -system-freetype \
-#   -system-xcb -xkb -no-opengl \
-#   -qt-xkbcommon -qt-xkbcommon-x11
+#   -system-xcb -no-opengl
 #
 # Ensure that pkg-config is properly configured, or that
 #   PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:/opt/X11/share/pkgconfig
 # is set in your build environment.
 #
+# If you don't want to use pkg-config, you can add:
+#   -L/opt/X11/lib -I/opt/X11/include
+# to the configure options.
+#
 # Due to irreconcilable differences between Cocoa
 # and X11, OpenGL is currently not supported.