diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:18:24 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:56:41 +0200 |
commit | e6286ca289db11463d13ec4d31055995b32ad258 (patch) | |
tree | 944bd3a2e93691bdd977ef7818b8241c1193d888 /src/gui | |
parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
parent | 9ae89313e43689483282ac330ad189db89bfcbba (diff) |
Merge remote-tracking branch 'origin/release' into stable
Manually fixed up: isES -> isOpenGLES
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qopenglcontext.h | 8 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.h | 2 | ||||
-rw-r--r-- | src/gui/text/qtextcursor.cpp | 2 | ||||
-rw-r--r-- | src/gui/text/qtextengine.cpp | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index c422d008c1..19aecee75a 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -196,19 +196,13 @@ public: enum OpenGLModuleType { LibGL, - LibGLES, - - // ### - DesktopGL = LibGL, - GLES2 = LibGLES + LibGLES }; static OpenGLModuleType openGLModuleType(); bool isOpenGLES() const; - bool isES() const { return isOpenGLES(); } // ### - Q_SIGNALS: void aboutToBeDestroyed(); diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 3278b7233c..0d13cfa648 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -297,7 +297,7 @@ Q_SIGNALS: void screenChanged(QScreen *screen); void modalityChanged(Qt::WindowModality modality); void windowStateChanged(Qt::WindowState windowState); - void windowTitleChanged(const QString &title); + Q_REVISION(2) void windowTitleChanged(const QString &title); void xChanged(int arg); void yChanged(int arg); diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp index ac9762b183..731b6adde8 100644 --- a/src/gui/text/qtextcursor.cpp +++ b/src/gui/text/qtextcursor.cpp @@ -132,7 +132,7 @@ QTextCursorPrivate::AdjustResult QTextCursorPrivate::adjustPosition(int position void QTextCursorPrivate::setX() { - if (priv->isInEditBlock()) { + if (priv->isInEditBlock() || priv->inContentsChange) { x = -1; // mark dirty return; } diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 34788dc4dc..67dedca760 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2057,7 +2057,7 @@ void QTextEngine::justify(const QScriptLine &line) // subtract one char more, as we can't justfy after the last character --line_length; - if (!line_length) + if (line_length <= 0) return; int firstItem = findItem(line.from); |