Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-virtualkeyboard for
openSUSE:Factory checked in at 2023-07-26 13:23:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-virtualkeyboard (Old)
and /work/SRC/openSUSE:Factory/.qt6-virtualkeyboard.new.15225 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-virtualkeyboard"
Wed Jul 26 13:23:00 2023 rev:20 rq:1100016 version:6.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-virtualkeyboard/qt6-virtualkeyboard.changes
2023-07-08 22:47:39.011306193 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-virtualkeyboard.new.15225/qt6-virtualkeyboard.changes
2023-07-26 13:23:39.059893595 +0200
@@ -1,0 +2,6 @@
+Thu Jul 20 09:07:24 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 6.5.2
+ * https://www.qt.io/blog/qt-6.5.2-released-1
+
+-------------------------------------------------------------------
Old:
----
qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz
New:
----
qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-virtualkeyboard.spec ++++++
--- /var/tmp/diff_new_pack.hHnadB/_old 2023-07-26 13:23:39.783897964 +0200
+++ /var/tmp/diff_new_pack.hHnadB/_new 2023-07-26 13:23:39.787897989 +0200
@@ -16,7 +16,7 @@
#
-%define real_version 6.5.1
+%define real_version 6.5.2
%define short_version 6.5
%define tar_name qtvirtualkeyboard-everywhere-src
%define tar_suffix %{nil}
@@ -27,12 +27,12 @@
%endif
#
Name: qt6-virtualkeyboard%{?pkg_suffix}
-Version: 6.5.1
+Version: 6.5.2
Release: 0
Summary: Framework for writing or integrating input methods and engines
for Qt 6
License: GPL-3.0-only
URL: https://www.qt.io
-Source:
https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
+Source:
https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source99: qt6-virtualkeyboard-rpmlintrc
BuildRequires: pkgconfig
BuildRequires: qt6-core-private-devel
++++++ qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz ->
qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.5.1/.cmake.conf
new/qtvirtualkeyboard-everywhere-src-6.5.2/.cmake.conf
--- old/qtvirtualkeyboard-everywhere-src-6.5.1/.cmake.conf 2023-05-16
13:44:41.000000000 +0200
+++ new/qtvirtualkeyboard-everywhere-src-6.5.2/.cmake.conf 2023-07-07
18:22:14.000000000 +0200
@@ -1,3 +1,3 @@
-set(QT_REPO_MODULE_VERSION "6.5.1")
+set(QT_REPO_MODULE_VERSION "6.5.2")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.5.1/.tag
new/qtvirtualkeyboard-everywhere-src-6.5.2/.tag
--- old/qtvirtualkeyboard-everywhere-src-6.5.1/.tag 2023-05-16
13:44:41.000000000 +0200
+++ new/qtvirtualkeyboard-everywhere-src-6.5.2/.tag 2023-07-07
18:22:14.000000000 +0200
@@ -1 +1 @@
-84122509d1c568de3dbdceb032747de4a438d4dd
+d642710f70d359cc8b22cb76c77ed6309f82d390
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/CMakeLists.txt
new/qtvirtualkeyboard-everywhere-src-6.5.2/CMakeLists.txt
--- old/qtvirtualkeyboard-everywhere-src-6.5.1/CMakeLists.txt 2023-05-16
13:44:41.000000000 +0200
+++ new/qtvirtualkeyboard-everywhere-src-6.5.2/CMakeLists.txt 2023-07-07
18:22:14.000000000 +0200
@@ -18,6 +18,7 @@
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals
Core) # special case
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Qml
QmlTools Quick Svg QuickTest QuickControls2) # special case
+qt_internal_project_setup()
if(NOT TARGET Qt::Quick)
message(NOTICE "Skipping the build as the condition \"TARGET Qt::Quick\"
is not met.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtvirtualkeyboard-everywhere-src-6.5.1/conanfile.py
new/qtvirtualkeyboard-everywhere-src-6.5.2/conanfile.py
--- old/qtvirtualkeyboard-everywhere-src-6.5.1/conanfile.py 2023-05-16
13:44:41.000000000 +0200
+++ new/qtvirtualkeyboard-everywhere-src-6.5.2/conanfile.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-# Copyright (C) 2021 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH
Qt-GPL-exception-1.0
-
-from conans import ConanFile
-import re
-from pathlib import Path
-
-
-def _parse_qt_version_by_key(key: str) -> str:
- with open(Path(__file__).parent.resolve() / ".cmake.conf") as f:
- m = re.search(fr'{key} .*"(.*)"', f.read())
- return m.group(1) if m else ""
-
-
-def _get_qt_minor_version() -> str:
- return
".".join(_parse_qt_version_by_key("QT_REPO_MODULE_VERSION").split(".")[:2])
-
-
-class QtVirtualKeyboard(ConanFile):
- name = "qtvirtualkeyboard"
- license = "GPL-3.0+, Commercial Qt License Agreement"
- author = "The Qt Company <https://www.qt.io/contact-us>"
- url = "https://code.qt.io/cgit/qt/qtvirtualkeyboard.git";
- description = (
- "The Qt Virtual Keyboard project provides an input framework and "
- "reference keyboard frontend for Qt on Linux Desktop/X11, "
- "Windows Desktop, and Boot2Qt targets."
- )
- topics = "qt", "qt6", "input", "keyboard"
- settings = "os", "compiler", "arch", "build_type"
- # for referencing the version number and prerelease tag and dependencies
info
- exports = ".cmake.conf", "dependencies.yaml"
- exports_sources = "*", "!conan*.*"
- python_requires =
f"qt-conan-common/{_get_qt_minor_version()}@qt/everywhere"
- python_requires_extend = "qt-conan-common.QtLeafModule"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/dependencies.yaml
new/qtvirtualkeyboard-everywhere-src-6.5.2/dependencies.yaml
--- old/qtvirtualkeyboard-everywhere-src-6.5.1/dependencies.yaml
2023-05-16 13:44:41.000000000 +0200
+++ new/qtvirtualkeyboard-everywhere-src-6.5.2/dependencies.yaml
2023-07-07 18:22:14.000000000 +0200
@@ -1,13 +1,13 @@
dependencies:
../qtbase:
- ref: 55aee8697512af105dfefabc1e2ec41d4df1e45e
+ ref: af457a9f0f7eb1a2a7d11f495da508faab91a442
required: true
../qtdeclarative:
- ref: 65651dc1d333e2aded18b0d6f0b71c35e5b40c1c
+ ref: f289063ff19588a11dd79213632785cfda2909a0
required: true
../qtmultimedia:
- ref: 9aeba9885bcaeb678808f38a71191da1114a7e1d
+ ref: ca330332aae05023983dcf445f0b388070289c51
required: false
../qtsvg:
- ref: bc7b39eb4ed14f0613134dd4799d6a1743a48107
+ ref: 73757fd3c46eb0bf499c5770bc846851c14e42ae
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/src/components/ShadowInputControl.qml
new/qtvirtualkeyboard-everywhere-src-6.5.2/src/components/ShadowInputControl.qml
---
old/qtvirtualkeyboard-everywhere-src-6.5.1/src/components/ShadowInputControl.qml
2023-05-16 13:44:41.000000000 +0200
+++
new/qtvirtualkeyboard-everywhere-src-6.5.2/src/components/ShadowInputControl.qml
2023-07-07 18:22:14.000000000 +0200
@@ -9,6 +9,7 @@
Item {
id: control
+ property alias textEdit: shadowInput
enabled: keyboard.active && VirtualKeyboardSettings.fullScreenMode
@@ -106,11 +107,23 @@
}
}
+ Component.onCompleted: {
+ if (VirtualKeyboardSettings.fullScreenMode) {
+ InputContext.priv.shadow.inputItem = shadowInput
+ }
+ }
Connections {
target: VirtualKeyboardSettings
function onFullScreenModeChanged() {
InputContext.priv.shadow.inputItem =
VirtualKeyboardSettings.fullScreenMode ? shadowInput : null
+ }
+ }
+ Connections {
+ target: InputContext.priv.shadow
+ function onInputItemChanged() {
cursorSyncTimer.stop()
+ if (!InputContext.priv.shadow.inputItem)
+ shadowInput.clear()
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/src/settings/qquickvirtualkeyboardsettings.cpp
new/qtvirtualkeyboard-everywhere-src-6.5.2/src/settings/qquickvirtualkeyboardsettings.cpp
---
old/qtvirtualkeyboard-everywhere-src-6.5.1/src/settings/qquickvirtualkeyboardsettings.cpp
2023-05-16 13:44:41.000000000 +0200
+++
new/qtvirtualkeyboard-everywhere-src-6.5.2/src/settings/qquickvirtualkeyboardsettings.cpp
2023-07-07 18:22:14.000000000 +0200
@@ -529,9 +529,8 @@
/*!
\since QtQuick.VirtualKeyboard.Settings 2.2
- \qmlpropertygroup
QtQuick.VirtualKeyboard::VirtualKeyboardSettings::wordCandidateList
- \qmlproperty int
QtQuick.VirtualKeyboard::VirtualKeyboardSettings::wordCandidateList.autoHideDelay
- \qmlproperty bool
QtQuick.VirtualKeyboard::VirtualKeyboardSettings::wordCandidateList.alwaysVisible
+ \qmlproperty int VirtualKeyboardSettings::wordCandidateList.autoHideDelay
+ \qmlproperty bool VirtualKeyboardSettings::wordCandidateList.alwaysVisible
\table
\header
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/CMakeLists.txt
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/CMakeLists.txt
--- old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/CMakeLists.txt
2023-05-16 13:44:41.000000000 +0200
+++ new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/CMakeLists.txt
2023-07-07 18:22:14.000000000 +0200
@@ -12,3 +12,4 @@
add_subdirectory(layoutresources)
# add_subdirectory(cmake) # special case
add_subdirectory(dictionarymanager)
+add_subdirectory(shadowinput)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/shadowinput/CMakeLists.txt
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/shadowinput/CMakeLists.txt
---
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/shadowinput/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/shadowinput/CMakeLists.txt
2023-07-07 18:22:14.000000000 +0200
@@ -0,0 +1,17 @@
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
+list(APPEND test_data ${test_data_glob})
+
+qt_internal_add_test(tst_shadowinput
+ QMLTEST
+ SOURCES
+ tst_shadowinput.cpp
+ LIBRARIES
+ Qt::Gui
+ TESTDATA ${test_data}
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/shadowinput/data/inputpanel/inputpanel.qml
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/shadowinput/data/inputpanel/inputpanel.qml
---
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/shadowinput/data/inputpanel/inputpanel.qml
1970-01-01 01:00:00.000000000 +0100
+++
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/shadowinput/data/inputpanel/inputpanel.qml
2023-07-07 18:22:14.000000000 +0200
@@ -0,0 +1,24 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+import QtTest
+import QtQuick
+import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Settings
+
+InputPanel {
+ id: inputPanel
+ z: 99
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ visible: active
+ property bool fullScreenMode: true
+ property bool shadowInputVisible: keyboard.shadowInputControl.visible
+ property string shadowInputText: keyboard.shadowInputControl.textEdit.text
+ Binding {
+ target: VirtualKeyboardSettings
+ property: "fullScreenMode"
+ value: inputPanel.fullScreenMode
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/shadowinput/data/tst_shadowinput.qml
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/shadowinput/data/tst_shadowinput.qml
---
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/shadowinput/data/tst_shadowinput.qml
1970-01-01 01:00:00.000000000 +0100
+++
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/shadowinput/data/tst_shadowinput.qml
2023-07-07 18:22:14.000000000 +0200
@@ -0,0 +1,92 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+import QtTest
+import QtQuick
+import QtQuick.Window
+
+Rectangle {
+ id: container
+ width: 800
+ height: 640
+ color: "blue"
+
+ Component {
+ id: textInputComp
+ TextEdit {
+ anchors.fill: parent
+ visible: true
+ focus: true
+ color: "white"
+ }
+ }
+
+ TestCase {
+ id: testcase
+ name: "tst_inputpanelcontrols"
+ when: windowShown
+
+ property var inputPanel: null
+ property var textInput: null
+
+ function initTestCase() {
+ var inputPanelComp =
Qt.createComponent("inputpanel/inputpanel.qml")
+ compare(inputPanelComp.status, Component.Ready, "Failed to create
component: "+inputPanelComp.errorString())
+ inputPanel = inputPanelComp.createObject(container)
+
+ textInput = textEditComp.createObject(container)
+ }
+
+ function cleanupTestCase() {
+ if (inputPanel)
+ inputPanel.destroy()
+ }
+
+ function prepareTest() {
+ var window = container.Window.window
+ verify(window)
+ window.raise()
+ window.requestActivate()
+ tryCompare(window, "active", true)
+
+ container.forceActiveFocus()
+ waitForRendering(container)
+ textInput.forceActiveFocus()
+ waitForRendering(inputPanel)
+
+ textInput.text = ""
+ verify(inputPanel.visible === true)
+ verify(textInput.activeFocus === true)
+ }
+
+ Component {
+ id: textEditComp
+ TextEdit {
+ id: textEdit
+ visible: true
+ focus: true
+ color: "white"
+ }
+ }
+
+ function test_fullScreenModeBindingWorks() {
+ prepareTest()
+
+ verify(inputPanel.visible === true)
+ waitForRendering(inputPanel)
+
+ // VirtualKeyboardSettings.fullScreeenMode is initially true
+ // Verity that shadow input is visible and the content match with
the edit field
+ verify(inputPanel.shadowInputVisible)
+ textInput.text = "hello"
+ compare(inputPanel.shadowInputText, textInput.text)
+
+ // Disable fullScreenMode and verify
+ inputPanel.fullScreenMode = false
+ waitForRendering(inputPanel)
+ verify(!inputPanel.shadowInputVisible)
+ textInput.text = "world"
+ compare(inputPanel.shadowInputText, "")
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/shadowinput/tst_shadowinput.cpp
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/shadowinput/tst_shadowinput.cpp
---
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/auto/shadowinput/tst_shadowinput.cpp
1970-01-01 01:00:00.000000000 +0100
+++
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/auto/shadowinput/tst_shadowinput.cpp
2023-07-07 18:22:14.000000000 +0200
@@ -0,0 +1,12 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#include <QtQuickTest/quicktest.h>
+#include <QByteArray>
+#include <QStandardPaths>
+#include <QFileInfo>
+#include <QDir>
+
+static bool s_configEnv = qputenv("QT_IM_MODULE",
QByteArray("qtvirtualkeyboard"));
+
+QUICK_TEST_MAIN(shadowinput)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/manual/CMakeLists.txt
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/manual/CMakeLists.txt
--- old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/manual/CMakeLists.txt
2023-05-16 13:44:41.000000000 +0200
+++ new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/manual/CMakeLists.txt
2023-07-07 18:22:14.000000000 +0200
@@ -3,7 +3,7 @@
# Generated from manual.pro.
-find_package(X11 REQUIRED)
+find_package(X11)
if(X11_FOUND)
add_subdirectory(x11vkbwrapper)
add_subdirectory(x11vkbtest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/manual/x11vkbwrapper/vkbnativehost/install_host.sh
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/manual/x11vkbwrapper/vkbnativehost/install_host.sh
---
old/qtvirtualkeyboard-everywhere-src-6.5.1/tests/manual/x11vkbwrapper/vkbnativehost/install_host.sh
2023-05-16 13:44:41.000000000 +0200
+++
new/qtvirtualkeyboard-everywhere-src-6.5.2/tests/manual/x11vkbwrapper/vkbnativehost/install_host.sh
2023-07-07 18:22:14.000000000 +0200
@@ -1,32 +1,6 @@
#!/bin/bash
-#******************************************************************************
-#**
-#** Copyright (C) 2019 The Qt Company Ltd.
-#** Contact: https://www.qt.io/licensing/
-#**
-#** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit.
-#**
-#** $QT_BEGIN_LICENSE:GPL$
-#** 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 https://www.qt.io/terms-conditions. For further
-#** information use the contact form at https://www.qt.io/contact-us.
-#**
-#** GNU General Public License Usage
-#** Alternatively, this file may be used under the terms of the GNU
-#** General Public License version 3 or (at your option) any later version
-#** approved by the KDE Free Qt Foundation. The licenses are as published by
-#** the Free Software Foundation and appearing in the file LICENSE.GPL3
-#** 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.
-#**
-#** $QT_END_LICENSE$
-#**
-#****************************************************************************/
+# Copyright (C) 2019 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
set -e
BROWSER=$1
