Merge remote-tracking branch 'origin/5.3' into 5.4

Manually included changes from
3a347a4e70e5a10ee92dd2578316c926a399e894
in src/opengl/qgl.cpp.

Conflicts:
	src/opengl/qgl_qpa.cpp
	src/plugins/platforms/android/androidjnimain.cpp

Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929

1 files changed, 4 insertions, 4 deletions

diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp
index bf39b9309d..926d36f73f 100644
--- a/src/printsupport/kernel/qprintengine_win.cpp
+++ b/src/printsupport/kernel/qprintengine_win.cpp
@@ -203,7 +203,7 @@ bool QWin32PrintEngine::newPage()
 
     bool transparent = GetBkMode(d->hdc) == TRANSPARENT;
 
-    if (!EndPage(d->hdc)) {
+    if (EndPage(d->hdc) <= 0) {
         qErrnoWarning("QWin32PrintEngine::newPage: EndPage failed");
         return false;
     }
@@ -216,7 +216,7 @@ bool QWin32PrintEngine::newPage()
         d->reinit = false;
     }
 
-    if (!StartPage(d->hdc)) {
+    if (StartPage(d->hdc) <= 0) {
         qErrnoWarning("Win32PrintEngine::newPage: StartPage failed");
         return false;
     }
@@ -235,7 +235,7 @@ bool QWin32PrintEngine::newPage()
 
     bool success = false;
     if (d->hdc && d->state == QPrinter::Active) {
-        if (EndPage(d->hdc) != SP_ERROR) {
+        if (EndPage(d->hdc) > 0) {
             // reinitialize the DC before StartPage if needed,
             // because resetdc is disabled between calls to the StartPage and EndPage functions
             // (see StartPage documentation in the Platform SDK:Windows GDI)
@@ -248,7 +248,7 @@ bool QWin32PrintEngine::newPage()
                     qErrnoWarning("QWin32PrintEngine::newPage(), ResetDC failed (2)");
                 d->reinit = false;
             }
-            success = (StartPage(d->hdc) != SP_ERROR);
+            success = (StartPage(d->hdc) > 0);
         }
         if (!success) {
             d->state = QPrinter::Aborted;