diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-27 17:25:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-05 11:03:12 +0200 |
commit | 1a42aa78af040d0fbecc960e4f9dd3f180ccb404 (patch) | |
tree | 8f824b3548f0af18b91ed4737b72bdf8a2bed7e1 /recipes-qt/qt5/qtquick1 | |
parent | 85694b94aa0b1e536eda13e7239720bca114b000 (diff) |
qt5: upgrade to latest revisions in 5.7 branch
* LIC_FILES_CHKSUM were changed because of this small change:
commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6
Author: Sze Howe Koh <szehowe.koh@gmail.com>
Date: Tue Jun 14 19:12:35 2016 +0800
Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"
* -no-nis option was removed from qtbase in:
commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db
Author: Ralf Nolden <nolden@kde.org>
Date: Fri May 20 22:03:39 2016 +0200
Cleanup NIS support leftover from Qt 3/4
* allow to disable eglfs independently from gles2, because eglfs-egldevice
may be autodetected when libdrm was built before qtbase since this
upstream commit:
commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0
Author: Ralf Nolden <nolden@kde.org>
Date: Tue May 17 12:38:44 2016 +0200
Make eglfs-egldevice check work with pkgconfig as well
and then it fails to build, because libdrm could be removed from sysroot
and drm.h is missing.
* recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch
was resolved in upstream commit:
commit 26229cfa0b729313893af5674d604e8692dbb946
Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Date: Tue Apr 26 15:08:34 2016 +0200
QDeclarativeTextInput: update API to use setBlinkingCursorEnabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtquick1')
-rw-r--r-- | recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch b/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch deleted file mode 100644 index 27a2140c..00000000 --- a/recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 450d5dee6cc4f35a7475af507b90ba67327ad724 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 26 Apr 2016 17:48:18 +0200 -Subject: [PATCH] qdeclarativetextinput: update to match QWidgetLineControl API - change - -* setCursorBlinkPeriod was replaced with setBlinkingCursorEnabled & - updateCursorBlinking in qtbase commit: - commit 1b5bc9723c0b23ca5197097c3087df6bbe024a2a - Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> - Date: Tue Apr 19 10:15:54 2016 +0200 - Subject: QWidgetLineControl: respect run-time changes to cursorFlashTime - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp -index 3ff75fd..e39d1af 100644 ---- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp -+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp -@@ -514,7 +514,7 @@ void QDeclarativeTextInput::setCursorVisible(bool on) - if (d->cursorVisible == on) - return; - d->cursorVisible = on; -- d->control->setCursorBlinkPeriod(on?QApplication::cursorFlashTime():0); -+ d->control->setBlinkingCursorEnabled(on); - QRect r = d->control->cursorRect(); - if (d->control->inputMask().isEmpty()) - updateRect(r); |