Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: Ic712e8a84b01b212bb1121d7a2c9b85e0d2da9da

4 files changed, 6 insertions, 14 deletions

diff --git a/src/gui/configure.json b/src/gui/configure.json
index a4ea4375d1..d7c0da4640 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -445,7 +445,7 @@
             ],
             "sources": [
                 { "type": "pkgConfig", "args": "gl", "condition": "!config.darwin" },
-                { "type": "openglMakeSpec" }
+                { "type": "makeSpec", "spec": "OPENGL" }
             ]
         },
         "opengl_es2": {
diff --git a/src/gui/configure.pri b/src/gui/configure.pri
index 0db106597e..1b95449a10 100644
--- a/src/gui/configure.pri
+++ b/src/gui/configure.pri
@@ -15,17 +15,6 @@ defineTest(qtConfLibrary_freetype) {
     return(true)
 }
 
-defineTest(qtConfLibrary_openglMakeSpec) {
-    darwin:sdk {
-        sysrootified =
-        for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
-        QMAKE_INCDIR_OPENGL = $$sysrootified
-    }
-    $${1}.spec = OPENGL
-    !qtConfLibrary_makeSpec($$1, $$2): return(false)
-    return(true)
-}
-
 # Check for Direct X shader compiler 'fxc'.
 # Up to Direct X SDK June 2010 and for MinGW, this is pointed to by the
 # DXSDK_DIR variable. Starting with Windows Kit 8, it is included in
diff --git a/src/gui/opengl/qopengldebug.cpp b/src/gui/opengl/qopengldebug.cpp
index 2e628a2bd5..9f1bb76869 100644
--- a/src/gui/opengl/qopengldebug.cpp
+++ b/src/gui/opengl/qopengldebug.cpp
@@ -1366,7 +1366,7 @@ bool QOpenGLDebugLogger::initialize()
 
 #define GET_DEBUG_PROC_ADDRESS(procName) \
     d->procName = reinterpret_cast< qt_ ## procName ## _t >( \
-        d->context->getProcAddress(#procName) \
+        d->context->getProcAddress(d->context->isOpenGLES() ? (#procName "KHR") : (#procName)) \
     );
 
     GET_DEBUG_PROC_ADDRESS(glDebugMessageControl);
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index 2e1a2b5bff..bed0a2c450 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -145,6 +145,9 @@ struct QTextLayoutStruct {
     inline QFixed absoluteY() const
     { return frameY + y; }
 
+    inline QFixed contentHeight() const
+    { return pageHeight - pageBottomMargin - pageTopMargin; }
+
     inline int currentPage() const
     { return pageHeight == 0 ? 0 : (absoluteY() / pageHeight).truncate(); }
 
@@ -2701,7 +2704,7 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi
             getLineHeightParams(blockFormat, line, scaling, &lineAdjustment, &lineBreakHeight, &lineHeight, &lineBottom);
 
             while (layoutStruct->pageHeight > 0 && layoutStruct->absoluteY() + lineBreakHeight > layoutStruct->pageBottom &&
-                layoutStruct->pageHeight >= lineBreakHeight) {
+                layoutStruct->contentHeight() >= lineBreakHeight) {
                 layoutStruct->newPage();
 
                 floatMargins(layoutStruct->y, layoutStruct, &left, &right);