Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2017-09-19 16:21:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Tue Sep 19 16:21:30 2017 rev:49 rq:526621 version:5.38.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2017-08-24 17:55:36.817257482 +0200
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes
2017-09-19 16:21:31.103211836 +0200
@@ -1,0 +2,11 @@
+Tue Sep 12 07:11:16 CEST 2017 - lbeltr...@kde.org
+
+- Update to 5.38.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.38.0.php
+- Changes since 5.37.0:
+ * Return high-resolution line edit clear icon
+ * Fix accepting dialogs with ctrl+return when buttons are renamed
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-5.37.0.tar.xz
New:
----
frameworkintegration-5.38.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.0I9Fj0/_old 2017-09-19 16:21:31.911097960 +0200
+++ /var/tmp/diff_new_pack.0I9Fj0/_new 2017-09-19 16:21:31.911097960 +0200
@@ -17,23 +17,26 @@
%define lname libKF5Style5
-%define _tar_path 5.37
+%define _tar_path 5.38
+# Full KF5 version (e.g. 5.33.0)
+%{!?_kf5_version: %global _kf5_version %{version}}
+# Last major and minor KF5 version (e.g. 5.33)
+%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
Name: frameworkintegration
-Version: 5.37.0
+Version: 5.38.0
Release: 0
-%define kf5_version %{version}
BuildRequires: cmake >= 3.0
-BuildRequires: extra-cmake-modules >= %{_tar_path}
+BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
-BuildRequires: kconfig-devel >= %{_tar_path}
-BuildRequires: kconfigwidgets-devel >= %{_tar_path}
+BuildRequires: kconfig-devel >= %{_kf5_bugfix_version}
+BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version}
BuildRequires: kf5-filesystem
-BuildRequires: ki18n-devel >= %{_tar_path}
-BuildRequires: kiconthemes-devel >= %{_tar_path}
-BuildRequires: kio-devel >= %{_tar_path}
-BuildRequires: knotifications-devel >= %{_tar_path}
-BuildRequires: kpackage-devel >= %{_tar_path}
-BuildRequires: kwidgetsaddons-devel >= %{_tar_path}
+BuildRequires: ki18n-devel >= %{_kf5_bugfix_version}
+BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version}
+BuildRequires: kio-devel >= %{_kf5_bugfix_version}
+BuildRequires: knotifications-devel >= %{_kf5_bugfix_version}
+BuildRequires: kpackage-devel >= %{_kf5_bugfix_version}
+BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version}
%if 0%{?suse_version} >= 1330 || (0%{?sle_version} >= 120200 &&
0%{?is_opensuse})
BuildRequires: cmake(AppStreamQt) >= 0.10.4
%endif
@@ -91,8 +94,8 @@
Group: Development/Libraries/KDE
Requires: %lname = %{version}
Requires: extra-cmake-modules
-Requires: kconfigwidgets-devel >= %{_tar_path}
-Requires: kiconthemes-devel >= %{_tar_path}
+Requires: kconfigwidgets-devel >= %{_kf5_bugfix_version}
+Requires: kiconthemes-devel >= %{_kf5_bugfix_version}
%description devel
Framework Integration is a set of plugins responsible for better
++++++ frameworkintegration-5.37.0.tar.xz -> frameworkintegration-5.38.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.37.0/CMakeLists.txt
new/frameworkintegration-5.38.0/CMakeLists.txt
--- old/frameworkintegration-5.37.0/CMakeLists.txt 2017-08-06
18:25:41.000000000 +0200
+++ new/frameworkintegration-5.38.0/CMakeLists.txt 2017-09-02
23:05:52.000000000 +0200
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.37.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.37.0") # handled by release scripts
+set(KF5_VERSION "5.38.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.38.0") # handled by release scripts
project(FrameworkIntegration VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.37.0 NO_MODULE)
+find_package(ECM 5.38.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.37.0/plasma_workspace.notifyrc
new/frameworkintegration-5.38.0/plasma_workspace.notifyrc
--- old/frameworkintegration-5.37.0/plasma_workspace.notifyrc 2017-08-06
18:25:41.000000000 +0200
+++ new/frameworkintegration-5.38.0/plasma_workspace.notifyrc 2017-09-02
23:05:52.000000000 +0200
@@ -13,6 +13,7 @@
Comment[en_GB]=Plasma Workspace
Comment[es]=Espacio de trabajo Plasma
Comment[et]=Plasma töötsoon
+Comment[eu]=Plasma langunea
Comment[fi]=Plasma-työtila
Comment[fr]=Espace de travail Plasma
Comment[gd]=Rum-obrach Plasma
@@ -59,6 +60,7 @@
Name[en_GB]=Wastebin: Emptied
Name[es]=Papelera: vacía
Name[et]=Prügikast: tühjendatud
+Name[eu]=Zakarrontzia: Hustuta
Name[fi]=Roskakori: Tyhjennetty
Name[fr]=Corbeille : vidée
Name[gd]=An sgudal: falamh
@@ -103,6 +105,7 @@
Comment[en_GB]=The wastebin has been emptied
Comment[es]=Se ha vaciado la papelera
Comment[et]=Prügikast on tühjendatud
+Comment[eu]=Zakarrontzia hustu da
Comment[fi]=Roskakori on tyhjennetty
Comment[fr]=La corbeille a été vidée
Comment[gd]=Chaidh an sgudal fhalamhachadh
@@ -150,6 +153,7 @@
Name[en_GB]=Textcompletion: Rotation
Name[es]=Terminación de texto: rotación
Name[et]=Tekstilõpetus: rotatsioon
+Name[eu]=Testu-osatzea: Biraketa
Name[fi]=Tekstin täydennys: kiertävä
Name[fr]=Auto-complément de texte : rotation
Name[gd]=Coileanadh teacsa: cuairteachadh
@@ -193,6 +197,7 @@
Comment[en_GB]=The end of the list of matches has been reached
Comment[es]=Se ha alcanzado el final de la lista de coincidencias
Comment[et]=Jõuti sobivuste nimekirja lõppu
+Comment[eu]=Bat-etortze zerrendaren amaierara iritsi da
Comment[fi]=Sopivien sanojen luettelo on käyty läpi
Comment[fr]=La fin de la liste des correspondances a été atteinte
Comment[gd]=Ràinig thu an deireadh de na tha de sheisean ann
@@ -239,6 +244,7 @@
Name[en_GB]=Textcompletion: No Match
Name[es]=Terminación de texto: ninguna coincidencia
Name[et]=Tekstilõpetus: sobivused puuduvad
+Name[eu]=Testu-osatzea: Bat-etortzerik ez
Name[fi]=Tekstin täydennys: Ei sopivia
Name[fr]=Auto-complément de texte : aucune correspondance
Name[gd]=Coileanadh teacsa: cha do lorg sinn gin
@@ -282,6 +288,7 @@
Comment[en_GB]=No matching completion was found
Comment[es]=No se ha encontrado ninguna coincidencia de terminación
Comment[et]=Ühtegi sobivat lõpetust ei leitud
+Comment[eu]=Ez da aurkitu osatzeko bat-datozenik
Comment[fi]=Sopivaa täydennystä ei löytynyt
Comment[fr]=Aucune correspondance d'auto-complément n'a été trouvée
Comment[gd]=Cha deach coileanadh a fhreagras a lorg
@@ -328,6 +335,7 @@
Name[en_GB]=Textcompletion: Partial Match
Name[es]=Terminación de texto: coincidencia parcial
Name[et]=Tekstilõpetus: osaline sobivus
+Name[eu]=Testu-osatzea:
Name[fi]=Tekstin täydennys: Osittainen osuma
Name[fr]=Auto-complément de texte : correspondance partielle
Name[gd]=Coileanadh teacsa: pàirt dheth co-ionnann
@@ -371,6 +379,7 @@
Comment[en_GB]=There is more than one possible match
Comment[es]=Existe más de una posible coincidencia
Comment[et]=Võimalikke sobivusi on enam kui üks
+Comment[eu]=Bat-etortze aukera bat baino gehiago dago
Comment[fi]=Löytyi useampi kuin yksi mahdollinen osuma
Comment[fr]=Il existe plus d'une correspondance possible
Comment[gd]=Lorg sinn barrachd air aon nì a fhreagradh
@@ -418,6 +427,7 @@
Name[en_GB]=Fatal Error
Name[es]=Error fatal
Name[et]=Parandamatu tõrge
+Name[eu]=Zoritxarreko errorea
Name[fi]=Vakava virhe
Name[fr]=Erreur fatale
Name[gd]=Mearachd mharbhtach
@@ -461,6 +471,7 @@
Comment[en_GB]=There was a serious error causing the program to exit
Comment[es]=Ha ocurrido un error serio que ha causado la salida del programa
Comment[et]=Tekkis tõsine viga, mis sundis programmi tööd lõpetama
+Comment[eu]=Errore garrantzitsua bat egon da programa ixtea eragin duena
Comment[fi]=Vakava virhe aiheutti ohjelman päättymisen
Comment[fr]=Une erreur grave a entraîné la fin du programme
Comment[gd]=Chaidh am prògram fhàgail ri linn mearachd dona
@@ -509,6 +520,7 @@
Name[en_GB]=Notification
Name[es]=Notificación
Name[et]=Märguanne
+Name[eu]=Jakinarazpena
Name[fi]=Ilmoitus
Name[fr]=Notification
Name[gd]=Brath
@@ -553,6 +565,7 @@
Comment[en_GB]=Something special happened in the program
Comment[es]=Ha ocurrido algo especial en el programa
Comment[et]=Programmis juhtus midagi erilist
+Comment[eu]=Zerbait berezia gertatu da programan
Comment[fi]=Ohjelmassa tapahtui jotakin erikoista
Comment[fr]=Quelque chose d'anormal s'est produit dans le programme
Comment[gd]=Thachair rudeigin sònraichte sa phrògram
@@ -600,6 +613,7 @@
Name[en_GB]=Warning
Name[es]=Advertencia
Name[et]=Hoiatus
+Name[eu]=Abisua
Name[fi]=Varoitus
Name[fr]=Avertissement
Name[gd]=Rabhadh
@@ -644,6 +658,7 @@
Comment[en_GB]=There was an error in the program which may cause problems
Comment[es]=Ha ocurrido un error en el programa que puede causar problemas
Comment[et]=Programmis tekkis viga, mis võib tekitada probleeme
+Comment[eu]=Errore bat egon da programan arazoak sor ditzakeena
Comment[fi]=Ohjelmassa oli virhe, joka voi aiheuttaa ongelmia
Comment[fr]=Il y a eu une erreur dans le programme qui peut causer des
problèmes
Comment[gd]=Bha mearachd sa phrògram a dh'adhbharaicheas trioblaid ma
dh'fhaoidte
@@ -691,6 +706,7 @@
Name[en_GB]=Catastrophe
Name[es]=Catástrofe
Name[et]=Katastroof
+Name[eu]=Hondamendia
Name[fi]=Katastrofi
Name[fr]=Catastrophe
Name[gd]=Tubaist
@@ -734,6 +750,7 @@
Comment[en_GB]=A very serious error occurred, at least causing the program to
exit
Comment[es]=Ha ocurrido un error muy serio que ha causado, al menos, la salida
del programa
Comment[et]=Tekkis väga tõsine viga, mis sundis programmi tööd lõpetama
+Comment[eu]=Errore oso garrantzitsu bat egon da, gutxienez programa ixtea
eragin duena
Comment[fi]=Tapahtui erittäin vakava virhe, joka aiheutti ainakin ohjelman
päättymisen
Comment[fr]=Une erreur très grave s'est produite, provoquant au minimum la fin
du programme
Comment[gd]=Thachair mearachd glè dhona agus chaidh am prògram fhàgail air a
char as lugha
@@ -780,6 +797,7 @@
Name[en_GB]=Application Crash
Name[es]=Fallo de aplicación
Name[et]=Rakenduse krahh
+Name[eu]=Aplikazioa kraskatu da
Name[fi]=Ohjelman kaatuminen
Name[fr]=Plantage de l'application
Name[gd]=Thuislich aplacaid
@@ -818,6 +836,7 @@
Comment[en_GB]=An application just closed unexpectedly
Comment[es]=Una aplicación se acaba de cerrar de forma no esperada
Comment[et]=Rakendus lõpetas lihtsalt ootamatult töö
+Comment[eu]=Aplikazio bat itxi da ustekabean
Comment[fi]=Ohjelma sulkeutui juuri odottamattomasti
Comment[fr]=Une application vient de se terminer de façon inattendue
Comment[gd]=Tha aplacaid air a dùnadh gun dùil
@@ -860,6 +879,7 @@
Name[en_GB]=Login
Name[es]=Inicio de sesión
Name[et]=Sisselogimine
+Name[eu]=Saio-hasiera
Name[fi]=Kirjautuminen
Name[fr]=Connexion
Name[gd]=Logadh a-steach
@@ -904,6 +924,7 @@
Comment[en_GB]=A new session is starting
Comment[es]=Está iniciando una nueva sesión
Comment[et]=Käivitub uus seanss
+Comment[eu]=Saio berri bat hasten ari da
Comment[fi]=Uusi istunto alkaa
Comment[fr]=Une nouvelle session démarre
Comment[gd]=Tha seisean ùr a' tòiseachadh
@@ -951,6 +972,7 @@
Name[en_GB]=Logout
Name[es]=Cierre de sesión
Name[et]=Väljalogimine
+Name[eu]=Saio-bukaera
Name[fi]=Uloskirjautuminen
Name[fr]=Déconnexion
Name[gd]=Logadh a-mach
@@ -995,6 +1017,7 @@
Comment[en_GB]=Session is exiting
Comment[es]=Está saliendo de la sesión
Comment[et]=Seanss suletakse
+Comment[eu]=Saioa ixten ari da
Comment[fi]=Istunto päättyy
Comment[fr]=La session se termine
Comment[gd]=Tha an seisean 'ga fhàgail
@@ -1043,6 +1066,7 @@
Name[en_GB]=Logout Cancelled
Name[es]=Cierre de sesión cancelado
Name[et]=Väljalogimine katkestatud
+Name[eu]=Saio-bukaera bertan behera utzi da
Name[fi]=Uloskirjautuminen peruttu
Name[fr]=Déconnexion annulée
Name[gd]=Chaidh sgur dhen logadh a-mach
@@ -1087,6 +1111,7 @@
Comment[en_GB]=Plasma logout was cancelled
Comment[es]=Se ha cancelado el cierre de sesión de Plasma
Comment[et]=Plasmast väljalogimine katkestati
+Comment[eu]=Plasmaren saio-bukaera bertan behera utzi da
Comment[fi]=Plasmasta uloskirjautuminen on peruttu
Comment[fr]=La déconnexion de Plasma a été annulée
Comment[gd]=Chaidh sgur dhen logadh a-mach à Plasma
@@ -1134,6 +1159,7 @@
Name[en_GB]=Print Error
Name[es]=Error de impresión
Name[et]=Trükkimise viga
+Name[eu]=Inprimatze errorea
Name[fi]=Tulostusvirhe
Name[fr]=Erreur d'impression
Name[gd]=Mearachd clò-bhualaidh
@@ -1178,6 +1204,7 @@
Comment[en_GB]=A print error has occurred
Comment[es]=Ha ocurrido un error de impresión
Comment[et]=Trükkimisel tekkis viga
+Comment[eu]=Inprimatze errore bat egon da
Comment[fi]=Tapahtui tulostusvirhe
Comment[fr]=Une erreur d'impression s'est produite
Comment[gd]=Thachair mearachd leis a' chlò-bhualadh
@@ -1225,6 +1252,7 @@
Name[en_GB]=Information Message
Name[es]=Mensaje de información
Name[et]=Info
+Name[eu]=Informazio mezua
Name[fi]=Ilmoitus
Name[fr]=Message d'informations
Name[gd]=Teachdaireachd fiosrachaidh
@@ -1269,6 +1297,7 @@
Comment[en_GB]=An information message is being shown
Comment[es]=Se está mostrando un mensaje de información
Comment[et]=Näidatakse infot
+Comment[eu]=Informazio mezu bat erakusten ari da
Comment[fi]=Ilmoitus näytetään
Comment[fr]=Un message d'informations est affiché
Comment[gd]=Tha teachdaireachd fiosrachaidh 'ga sealltainn
@@ -1316,6 +1345,7 @@
Name[en_GB]=Warning Message
Name[es]=Mensaje de advertencia
Name[et]=Hoiatus
+Name[eu]=Abisu mezua
Name[fi]=Varoitus
Name[fr]=Message d'avertissement
Name[gd]=Teachdaireachd rabhaidh
@@ -1360,6 +1390,7 @@
Comment[en_GB]=A warning message is being shown
Comment[es]=Se está mostrando un mensaje de advertencia
Comment[et]=Näidatakse hoiatust
+Comment[eu]=Abisu mezu bat erakusten ari da
Comment[fi]=Varoitus näytetään
Comment[fr]=Un message d'avertissement est affiché
Comment[gd]=Tha teachdaireachd rabhaidh 'ga sealltainn
@@ -1407,6 +1438,7 @@
Name[en_GB]=Critical Message
Name[es]=Mensaje crítico
Name[et]=Kriitiline teade
+Name[eu]=Mezu larria
Name[fi]=Hälytys
Name[fr]=Message critique
Name[gd]=Teachdaireachd èiginneach
@@ -1451,6 +1483,7 @@
Comment[en_GB]=A critical message is being shown
Comment[es]=Se está mostrando un mensaje crítico
Comment[et]=Näidatakse kriitilist teadet
+Comment[eu]=Mezu larri bat erakusten ari da
Comment[fi]=Hälytys näytetään
Comment[fr]=Un message critique est affiché
Comment[gd]=Tha teachdaireachd èiginneach 'ga sealltainn
@@ -1498,6 +1531,7 @@
Name[en_GB]=Question
Name[es]=Pregunta
Name[et]=Küsimus
+Name[eu]=Galdera
Name[fi]=Kysymys
Name[fr]=Question
Name[gd]=Ceist
@@ -1542,6 +1576,7 @@
Comment[en_GB]=A question is being asked
Comment[es]=Se está haciendo una pregunta
Comment[et]=Esitatakse küsimus
+Comment[eu]=Galdera bat egiten ari da
Comment[fi]=Esitetään kysymys
Comment[fr]=Une question vous est posée
Comment[gd]=Tha ceist 'ga fhaighneachd
@@ -1590,6 +1625,7 @@
Name[en_GB]=Beep
Name[es]=Pitido
Name[et]=Piiks
+Name[eu]=Bip
Name[fi]=Äänimerkki
Name[fr]=Cloche
Name[gd]=Bìd
@@ -1634,6 +1670,7 @@
Comment[en_GB]=Sound bell
Comment[es]=Campana de sonido
Comment[et]=Kellaheli
+Comment[eu]=Sistemaren txirrina
Comment[fi]=Äänimerkki
Comment[fr]=Cloche du système
Comment[gd]=Fuaim cluig
@@ -1680,6 +1717,7 @@
Name[en_GB]=Widget failed to install
Name[es]=La instalación del elemento gráfico ha fallado
Name[et]=Vidina paigaldamine nurjus
+Name[eu]=Trepeta instalatzea huts egin du
Name[fi]=Sovelman asennus epäonnistui
Name[fr]=Impossible d'installer un composant graphique
Name[gd]=Cha deach le stàladh a' widget
@@ -1718,6 +1756,7 @@
Comment[en_GB]=A widget could not be installed
Comment[es]=No se ha podido instalar un elemento gráfico
Comment[et]=Vidinat ei õnnestunud paigaldada
+Comment[eu]=Trepeta bat ezin izan da instalatu
Comment[fi]=Sovelmaa ei voitu asentaa
Comment[fr]=Un composant graphique n'a pu être installé
Comment[gd]=Cha b' urrainn dhuinn a' widget a stàladh
@@ -1759,6 +1798,7 @@
Name[en_GB]=Widget deleted
Name[es]=Elemento gráfico borrado
Name[et]=Vidin on kustutatud
+Name[eu]=Trepeta ezabatuta
Name[fi]=Sovelma poistettu
Name[fr]=Composant graphique supprimé
Name[gd]=Chaidh widget a sguabadh às
@@ -1799,6 +1839,7 @@
Comment[en_GB]=A widget has been deleted
Comment[es]=Se ha borrado un elemento gráfico
Comment[et]=Vidin kustutati
+Comment[eu]=Trepeta bat ezabatu da
Comment[fi]=Sovelma on poistettu
Comment[fr]=Un composant graphique a été supprimé
Comment[gd]=Chaidh widget a sguabadh às
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.37.0/src/kstyle/kstyle.cpp
new/frameworkintegration-5.38.0/src/kstyle/kstyle.cpp
--- old/frameworkintegration-5.37.0/src/kstyle/kstyle.cpp 2017-08-06
18:25:41.000000000 +0200
+++ new/frameworkintegration-5.38.0/src/kstyle/kstyle.cpp 2017-09-02
23:05:52.000000000 +0200
@@ -53,6 +53,7 @@
#include <QStyleOption>
#include <QPushButton>
#include <QToolBar>
+#include <QShortcut>
#include <kconfiggroup.h>
#include <kiconloader.h>
@@ -274,8 +275,10 @@
if (QDialogButtonBox *box = qobject_cast<QDialogButtonBox *>(w)) {
QPushButton *button = box->button(QDialogButtonBox::Ok);
- if (button && button->shortcut().isEmpty()) {
- button->setShortcut(Qt::CTRL | Qt::Key_Return);
+
+ if (button) {
+ auto shortcut = new QShortcut(Qt::CTRL | Qt::Key_Return, button);
+ QObject::connect(shortcut, &QShortcut::activated, button,
&QPushButton::click);
}
}
@@ -407,6 +410,14 @@
return QIcon::fromTheme(QStringLiteral("audio-volume-medium"));
case QStyle::SP_MediaVolumeMuted:
return QIcon::fromTheme(QStringLiteral("audio-volume-muted"));
+ case SP_LineEditClearButton: {
+ const bool rtl = (option && option->direction == Qt::RightToLeft) ||
(!option && QApplication::isRightToLeft());
+
+ const QString directionalThemeName = rtl
+ ? QStringLiteral("edit-clear-locationbar-ltr") :
QStringLiteral("edit-clear-locationbar-rtl");
+
+ return QIcon::fromTheme(directionalThemeName,
QIcon::fromTheme(QStringLiteral("edit-clear")));
+ }
default:
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.37.0/tests/kstyletest.cpp
new/frameworkintegration-5.38.0/tests/kstyletest.cpp
--- old/frameworkintegration-5.37.0/tests/kstyletest.cpp 2017-08-06
18:25:41.000000000 +0200
+++ new/frameworkintegration-5.38.0/tests/kstyletest.cpp 2017-09-02
23:05:52.000000000 +0200
@@ -45,12 +45,19 @@
dialog->setLayout(new QVBoxLayout);
QDialogButtonBox *box = new QDialogButtonBox(QDialogButtonBox::Cancel |
QDialogButtonBox::Ok, dialog.data());
- QObject::connect(box, SIGNAL(accepted()), dialog.data(), SLOT(accept()));
- QObject::connect(box, SIGNAL(rejected()), dialog.data(), SLOT(reject()));
- dialog->layout()->addWidget(new QTextEdit(dialog.data()));
+ //Useful to change the text because setting the text triggers setShortcut
+ box->button(QDialogButtonBox::Ok)->setText(QLatin1String("Send"));
+ QObject::connect(box, &QDialogButtonBox::accepted, dialog.data(),
&QDialog::accept);
+ QObject::connect(box, &QDialogButtonBox::rejected, dialog.data(),
&QDialog::reject);
+
+ auto usefulWidget = new QTextEdit(dialog.data());
+ dialog->layout()->addWidget(usefulWidget);
dialog->layout()->addWidget(box);
+ //Make sure we test ctrl+return acceptance with the focus on the button
+ usefulWidget->setFocus();
+
dialog->resize(200, 200);
dialog->exec();
}
