Hello community, here is the log from the commit of package qt5ct for openSUSE:Factory checked in at 2017-06-04 02:01:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt5ct (Old) and /work/SRC/openSUSE:Factory/.qt5ct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt5ct" Sun Jun 4 02:01:22 2017 rev:11 rq:500849 version:0.33 Changes: -------- --- /work/SRC/openSUSE:Factory/qt5ct/qt5ct.changes 2017-05-02 08:54:52.850424057 +0200 +++ /work/SRC/openSUSE:Factory/.qt5ct.new/qt5ct.changes 2017-06-04 02:01:29.914060933 +0200 @@ -1,0 +2,15 @@ +Sat Jun 3 12:58:14 UTC 2017 - [email protected] + +- Update to version 0.33 + * fixed build without dbus support (coacher) + * fixed Qt 5.6 support (coacher) + * updated Hebrew translation (Elkana Birdugo) + Version 0.32 + * added global menu support + * updated Czech translation (fri) + * updated Greek translation (Dimitrios Glentadakis) + * updated Russian translation + +- Changed source URL to https + +------------------------------------------------------------------- Old: ---- qt5ct-0.31.tar.bz2 New: ---- qt5ct-0.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt5ct.spec ++++++ --- /var/tmp/diff_new_pack.E88iUQ/_old 2017-06-04 02:01:31.609821578 +0200 +++ /var/tmp/diff_new_pack.E88iUQ/_new 2017-06-04 02:01:31.613821013 +0200 @@ -17,13 +17,13 @@ Name: qt5ct -Version: 0.31 +Version: 0.33 Release: 0 Summary: Qt5 Configuration Tool License: BSD-2-Clause Group: Development/Libraries/X11 Url: https://sourceforge.net/projects/qt5ct -Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 +Source: https://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 Source1: qt5ct.sh Source2: qt5ct.csh BuildRequires: gcc-c++ ++++++ qt5ct-0.31.tar.bz2 -> qt5ct-0.33.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/AUTHORS new/qt5ct-0.33/AUTHORS --- old/qt5ct-0.31/AUTHORS 2017-03-28 10:48:04.000000000 +0200 +++ new/qt5ct-0.33/AUTHORS 2017-05-29 20:57:01.000000000 +0200 @@ -12,7 +12,7 @@ French - David GEIGER <[email protected]>, Adrien DAUGABEL <[email protected]>, papoteur <[email protected]> Greek - Dimitrios Glentadakis - Hebrew - Genghis Khan + Hebrew - Genghis Khan, Elkana Birdugo Dutch (Netherlands) - Heimen Stoffels German - Ettore Atalan, Mario Blättermann Italian - Luigi Baldoni diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/ChangeLog new/qt5ct-0.33/ChangeLog --- old/qt5ct-0.31/ChangeLog 2017-03-28 10:48:04.000000000 +0200 +++ new/qt5ct-0.33/ChangeLog 2017-05-29 20:57:01.000000000 +0200 @@ -208,3 +208,14 @@ * updated German translation (Ettore Atalan) * updated Serbian translation (markosm) * updated Czech translation (fri) + +Version 0.32 +* added global menu support +* updated Czech translation (fri) +* updated Greek translation (Dimitrios Glentadakis) +* updated Russian translation + +Version 0.33 +* fixed build without dbus support (coacher) +* fixed Qt 5.6 support (coacher) +* updated Hebrew translation (Elkana Birdugo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/ChangeLog.svn new/qt5ct-0.33/ChangeLog.svn --- old/qt5ct-0.31/ChangeLog.svn 2017-03-28 10:48:04.000000000 +0200 +++ new/qt5ct-0.33/ChangeLog.svn 2017-05-29 20:57:01.000000000 +0200 @@ -1,4 +1,63 @@ ------------------------------------------------------------------------ +r414 | trialuser02 | 2017-05-29 21:52:01 +0300 (Пн., 29 мая 2017) | 1 line + +updated changelog +------------------------------------------------------------------------ +r413 | trialuser02 | 2017-05-29 21:49:43 +0300 (Пн., 29 мая 2017) | 1 line + +updated Hebrew translation (Elkana Birdugo) +------------------------------------------------------------------------ +r412 | trialuser02 | 2017-05-24 13:06:35 +0300 (Ср., 24 мая 2017) | 1 line + +updated changelog +------------------------------------------------------------------------ +r411 | trialuser02 | 2017-05-24 12:29:20 +0300 (Ср., 24 мая 2017) | 2 lines + +fixed Qt 5.6 support (#37) + +------------------------------------------------------------------------ +r409 | trialuser02 | 2017-05-17 08:12:59 +0300 (Ср., 17 мая 2017) | 1 line + +fixed build without dbus support (coacher, #36) +------------------------------------------------------------------------ +r408 | trialuser02 | 2017-05-14 13:51:09 +0300 (Вс., 14 мая 2017) | 1 line + +version bump +------------------------------------------------------------------------ +r406 | trialuser02 | 2017-05-12 23:10:11 +0300 (Пт., 12 мая 2017) | 1 line + +updated changelog +------------------------------------------------------------------------ +r405 | trialuser02 | 2017-05-12 23:05:35 +0300 (Пт., 12 мая 2017) | 1 line + +fixed Russian translation +------------------------------------------------------------------------ +r404 | trialuser02 | 2017-05-12 22:44:16 +0300 (Пт., 12 мая 2017) | 1 line + +fixed distclean target +------------------------------------------------------------------------ +r403 | trialuser02 | 2017-05-12 22:40:53 +0300 (Пт., 12 мая 2017) | 2 lines + +coding style fixes + +------------------------------------------------------------------------ +r402 | trialuser02 | 2017-05-12 22:32:23 +0300 (Пт., 12 мая 2017) | 2 lines + +added global menu support (#34) + +------------------------------------------------------------------------ +r401 | trialuser02 | 2017-03-31 22:42:24 +0300 (Пт., 31 марта 2017) | 1 line + +updated Greek translation (Dimitrios Glentadakis) +------------------------------------------------------------------------ +r400 | trialuser02 | 2017-03-31 22:39:05 +0300 (Пт., 31 марта 2017) | 1 line + +updated Czech translation (fri) +------------------------------------------------------------------------ +r399 | trialuser02 | 2017-03-28 11:49:16 +0300 (Вт., 28 марта 2017) | 1 line + +version bump +------------------------------------------------------------------------ r397 | trialuser02 | 2017-03-28 11:12:51 +0300 (Вт., 28 марта 2017) | 1 line updated changelog @@ -111,9 +170,10 @@ updated changelog ------------------------------------------------------------------------ -r369 | trialuser02 | 2017-01-26 20:40:33 +0300 (Чт., 26 янв. 2017) | 1 line +r369 | trialuser02 | 2017-01-26 20:40:33 +0300 (Чт., 26 янв. 2017) | 2 lines + +fixed issue with KDE styles (#32) -fixed issue with kde styles (#32) ------------------------------------------------------------------------ r368 | trialuser02 | 2017-01-26 08:18:41 +0300 (Чт., 26 янв. 2017) | 1 line @@ -550,7 +610,7 @@ ------------------------------------------------------------------------ r251 | trialuser02 | 2015-10-18 11:23:26 +0300 (Вс., 18 окт. 2015) | 2 lines -fixed inital widget spacing +fixed initial widget spacing ------------------------------------------------------------------------ r250 | trialuser02 | 2015-10-18 09:53:02 +0300 (Вс., 18 окт. 2015) | 1 line @@ -813,7 +873,7 @@ ------------------------------------------------------------------------ r184 | trialuser02 | 2015-09-02 00:25:20 +0300 (Ср., 02 сент. 2015) | 2 lines -fixed feauture to hide dialog buttons icons +fixed feature to hide dialog buttons icons ------------------------------------------------------------------------ r183 | trialuser02 | 2015-09-01 00:21:15 +0300 (Вт., 01 сент. 2015) | 1 line @@ -898,9 +958,10 @@ fixed regression ------------------------------------------------------------------------ -r162 | trialuser02 | 2015-05-16 10:33:58 +0300 (Сб., 16 мая 2015) | 1 line +r162 | trialuser02 | 2015-05-16 10:33:58 +0300 (Сб., 16 мая 2015) | 2 lines + +fixed problem in the IconThemePage::findIcon(..) method (patch by Sergey A. Sukiyazov) (#3) -fixed problem in the the IconThemePage::findIcon(..) method (patch by Sergey A. Sukiyazov) (#3) ------------------------------------------------------------------------ r161 | trialuser02 | 2015-05-12 21:15:43 +0300 (Вт., 12 мая 2015) | 1 line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/clear_qmake.sh new/qt5ct-0.33/clear_qmake.sh --- old/qt5ct-0.31/clear_qmake.sh 2017-03-28 10:48:04.000000000 +0200 +++ new/qt5ct-0.33/clear_qmake.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -#!/bin/sh - -#################################################### -# Removes remaining qmake files from qt5ct package # -#################################################### - -make distclean -find . -type f -name *.qm -delete -find . -type d -name ".build" | xargs rm -rf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/qt5ct.pri new/qt5ct-0.33/qt5ct.pri --- old/qt5ct-0.31/qt5ct.pri 2017-03-28 10:48:04.000000000 +0200 +++ new/qt5ct-0.33/qt5ct.pri 2017-05-29 20:57:01.000000000 +0200 @@ -4,6 +4,9 @@ OBJECTS_DIR=./.build/obj RCC_DIR=./.build/rcc +QMAKE_DISTCLEAN += -r .build +QMAKE_DISTCLEAN += translations/*.qm + CONFIG += c++11 !isEqual (QT_MAJOR_VERSION, 5) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/src/qt5ct/desktop-translations/qt5ct_he.desktop.in new/qt5ct-0.33/src/qt5ct/desktop-translations/qt5ct_he.desktop.in --- old/qt5ct-0.31/src/qt5ct/desktop-translations/qt5ct_he.desktop.in 2017-03-28 10:48:03.000000000 +0200 +++ new/qt5ct-0.33/src/qt5ct/desktop-translations/qt5ct_he.desktop.in 2017-05-29 20:57:01.000000000 +0200 @@ -17,6 +17,9 @@ + + + Exec=qt5ct Icon=preferences-desktop-theme Terminal=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/src/qt5ct/qt5ct.h new/qt5ct-0.33/src/qt5ct/qt5ct.h --- old/qt5ct-0.31/src/qt5ct/qt5ct.h 2017-03-28 10:48:03.000000000 +0200 +++ new/qt5ct-0.33/src/qt5ct/qt5ct.h 2017-05-29 20:57:00.000000000 +0200 @@ -30,7 +30,7 @@ #define QT5CT_H #define QT5CT_VERSION_MAJOR 0 -#define QT5CT_VERSION_MINOR 31 +#define QT5CT_VERSION_MINOR 33 #define QT5CT_TOSTRING(s) #s #define QT5CT_STRINGIFY(s) QT5CT_TOSTRING(s) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/src/qt5ct/translations/qt5ct_cs.ts new/qt5ct-0.33/src/qt5ct/translations/qt5ct_cs.ts --- old/qt5ct-0.31/src/qt5ct/translations/qt5ct_cs.ts 2017-03-28 10:48:03.000000000 +0200 +++ new/qt5ct-0.33/src/qt5ct/translations/qt5ct_cs.ts 2017-05-29 20:57:00.000000000 +0200 @@ -350,7 +350,7 @@ <message> <location filename="../interfacepage.ui" line="229"/> <source>Mouse wheel scroll lines:</source> - <translation type="unfinished"></translation> + <translation>Kolečko myši projíždí řádky:</translation> </message> <message> <location filename="../interfacepage.cpp" line="47"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/src/qt5ct/translations/qt5ct_el.ts new/qt5ct-0.33/src/qt5ct/translations/qt5ct_el.ts --- old/qt5ct-0.31/src/qt5ct/translations/qt5ct_el.ts 2017-03-28 10:48:03.000000000 +0200 +++ new/qt5ct-0.33/src/qt5ct/translations/qt5ct_el.ts 2017-05-29 20:57:00.000000000 +0200 @@ -346,37 +346,37 @@ <message> <location filename="../interfacepage.ui" line="219"/> <source>Toolbar button style:</source> - <translation type="unfinished"></translation> + <translation>Τεχνοτροπία των κουμπιών της γραμμής εργαλείων:</translation> </message> <message> <location filename="../interfacepage.ui" line="229"/> <source>Mouse wheel scroll lines:</source> - <translation type="unfinished"></translation> + <translation>Γραμμές κύλισης τροχού ποντικιού:</translation> </message> <message> <location filename="../interfacepage.cpp" line="47"/> <source>Only display the icon</source> - <translation type="unfinished"></translation> + <translation>Εμφάνιση μόνον του εικονιδίου</translation> </message> <message> <location filename="../interfacepage.cpp" line="48"/> <source>Only display the text</source> - <translation type="unfinished"></translation> + <translation>Εμφάνιση μόνον του κειμένου</translation> </message> <message> <location filename="../interfacepage.cpp" line="49"/> <source>The text appears beside the icon</source> - <translation type="unfinished"></translation> + <translation>Το κείμενο εμφανίζεται δίπλα από το εικονίδιο</translation> </message> <message> <location filename="../interfacepage.cpp" line="50"/> <source>The text appears under the icon</source> - <translation type="unfinished"></translation> + <translation>Το κείμενο εμφανίζεται κάτω από το εικονίδιο</translation> </message> <message> <location filename="../interfacepage.cpp" line="51"/> <source>Follow the application style</source> - <translation type="unfinished"></translation> + <translation>Ακολούθηση της τεχνοτροπίας της εφαρμογής</translation> </message> </context> <context> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/src/qt5ct/translations/qt5ct_he.ts new/qt5ct-0.33/src/qt5ct/translations/qt5ct_he.ts --- old/qt5ct-0.31/src/qt5ct/translations/qt5ct_he.ts 2017-03-28 10:48:03.000000000 +0200 +++ new/qt5ct-0.33/src/qt5ct/translations/qt5ct_he.ts 2017-05-29 20:57:00.000000000 +0200 @@ -46,12 +46,12 @@ <message> <location filename="../appearancepage.ui" line="139"/> <source>Color scheme:</source> - <translation type="unfinished"></translation> + <translation>ערכת צבעים:</translation> </message> <message> <location filename="../appearancepage.ui" line="162"/> <source>...</source> - <translation type="unfinished"></translation> + <translation>...</translation> </message> <message> <location filename="../appearancepage.cpp" line="65"/> @@ -83,7 +83,7 @@ <location filename="../appearancepage.cpp" line="194"/> <location filename="../appearancepage.cpp" line="229"/> <source>Enter Color Scheme Name</source> - <translation type="unfinished"></translation> + <translation>הזן שם של ערכת הצבעים</translation> </message> <message> <location filename="../appearancepage.cpp" line="120"/> @@ -104,7 +104,7 @@ <location filename="../appearancepage.cpp" line="205"/> <location filename="../appearancepage.cpp" line="239"/> <source>The color scheme "%1" already exists</source> - <translation type="unfinished"></translation> + <translation>ערכת הצבעים "%1" כבר קיימת </translation> </message> <message> <location filename="../appearancepage.cpp" line="147"/> @@ -118,7 +118,7 @@ <location filename="../appearancepage.cpp" line="170"/> <location filename="../appearancepage.cpp" line="224"/> <source>The color scheme "%1" is read only</source> - <translation type="unfinished"></translation> + <translation>ערכת הצבעים "%1" הינה לקריאה בלבד </translation> </message> <message> <location filename="../appearancepage.cpp" line="175"/> @@ -128,7 +128,7 @@ <message> <location filename="../appearancepage.cpp" line="176"/> <source>Are you sure you want to remove color scheme "%1"?</source> - <translation type="unfinished"></translation> + <translation>להסיר את ערכת הצבעים "%1"?</translation> </message> <message> <location filename="../appearancepage.cpp" line="196"/> @@ -224,7 +224,7 @@ <location filename="../fontspage.ui" line="80"/> <location filename="../fontspage.ui" line="87"/> <source>...</source> - <translation type="unfinished"></translation> + <translation>...</translation> </message> <message> <location filename="../fontspage.ui" line="57"/> @@ -288,7 +288,7 @@ <location filename="../interfacepage.ui" line="70"/> <location filename="../interfacepage.ui" line="80"/> <source> ms</source> - <translation type="unfinished"></translation> + <translation>מילישניות</translation> </message> <message> <location filename="../interfacepage.ui" line="94"/> @@ -325,7 +325,7 @@ <message> <location filename="../interfacepage.ui" line="182"/> <source>Dialog buttons layout:</source> - <translation type="unfinished"></translation> + <translation>פריסת לחצני דו־שיח</translation> </message> <message> <location filename="../interfacepage.ui" line="192"/> @@ -340,42 +340,42 @@ <message> <location filename="../interfacepage.ui" line="209"/> <source>Activate item on single-click</source> - <translation type="unfinished"></translation> + <translation>הפעל פריטים בלחיצה יחידה</translation> </message> <message> <location filename="../interfacepage.ui" line="219"/> <source>Toolbar button style:</source> - <translation type="unfinished"></translation> + <translation>עיצוב לחצן סרגל כלים </translation> </message> <message> <location filename="../interfacepage.ui" line="229"/> <source>Mouse wheel scroll lines:</source> - <translation type="unfinished"></translation> + <translation>גלגלת העכבר גוללת (שורות):</translation> </message> <message> <location filename="../interfacepage.cpp" line="47"/> <source>Only display the icon</source> - <translation type="unfinished"></translation> + <translation>הצג רק את הסמל</translation> </message> <message> <location filename="../interfacepage.cpp" line="48"/> <source>Only display the text</source> - <translation type="unfinished"></translation> + <translation>הצג רק את הטקסט</translation> </message> <message> <location filename="../interfacepage.cpp" line="49"/> <source>The text appears beside the icon</source> - <translation type="unfinished"></translation> + <translation>טקסט ליד הסמל</translation> </message> <message> <location filename="../interfacepage.cpp" line="50"/> <source>The text appears under the icon</source> - <translation type="unfinished"></translation> + <translation>טקסט מתחת לסמל</translation> </message> <message> <location filename="../interfacepage.cpp" line="51"/> <source>Follow the application style</source> - <translation type="unfinished"></translation> + <translation>לפי עיצוב היישום עצמו</translation> </message> </context> <context> @@ -398,7 +398,7 @@ <message> <location filename="../mainwindow.cpp" line="47"/> <source>Icon Theme</source> - <translation type="unfinished"></translation> + <translation>ערכת סמלים</translation> </message> <message> <location filename="../mainwindow.cpp" line="48"/> @@ -516,17 +516,17 @@ <message> <location filename="../paletteeditdialog.cpp" line="93"/> <source>Highlight</source> - <translation type="unfinished"></translation> + <translation>הבלט</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="93"/> <source>Highlighted text</source> - <translation type="unfinished"></translation> + <translation>הבלט טקסט</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="93"/> <source>Visited link</source> - <translation type="unfinished"></translation> + <translation>קישורים שנצפו</translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="94"/> @@ -688,22 +688,22 @@ <message> <location filename="../main.cpp" line="60"/> <source>Please remove the <b>QT_STYLE_OVERRIDE</b> environment variable</source> - <translation type="unfinished"></translation> + <translation>נא הסר את משתנה הסביבה <b>QT_STYLE_OVERRIDE</b></translation> </message> <message> <location filename="../main.cpp" line="65"/> <source>The <b>QT_QPA_PLATFORMTHEME</b> environment variable is not set correctly</source> - <translation type="unfinished"></translation> + <translation>משתנה הסביבה <b>QT_QPA_PLATFORMTHEME</b> אינו מוגדר כראוי</translation> </message> <message> <location filename="../main.cpp" line="71"/> <source>Unable to find <b>libqt5ct-style.so</b></source> - <translation type="unfinished"></translation> + <translation>לא ניתן למצוא את <b>libqt5ct-style.so</b></translation> </message> <message> <location filename="../main.cpp" line="76"/> <source>Error</source> - <translation type="unfinished">שגיאה</translation> + <translation>שגיאה</translation> </message> </context> </TS> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/src/qt5ct/translations/qt5ct_ru.ts new/qt5ct-0.33/src/qt5ct/translations/qt5ct_ru.ts --- old/qt5ct-0.31/src/qt5ct/translations/qt5ct_ru.ts 2017-03-28 10:48:03.000000000 +0200 +++ new/qt5ct-0.33/src/qt5ct/translations/qt5ct_ru.ts 2017-05-29 20:57:01.000000000 +0200 @@ -350,7 +350,7 @@ <message> <location filename="../interfacepage.ui" line="229"/> <source>Mouse wheel scroll lines:</source> - <translation>Колёсико мыши перематывает строк:</translation> + <translation>Шаг прокрутки колесом мыши, строк:</translation> </message> <message> <location filename="../interfacepage.cpp" line="47"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/src/qt5ct-qtplugin/qt5ct-qtplugin.pro new/qt5ct-0.33/src/qt5ct-qtplugin/qt5ct-qtplugin.pro --- old/qt5ct-0.31/src/qt5ct-qtplugin/qt5ct-qtplugin.pro 2017-03-28 10:48:03.000000000 +0200 +++ new/qt5ct-0.33/src/qt5ct-qtplugin/qt5ct-qtplugin.pro 2017-05-29 20:57:01.000000000 +0200 @@ -10,6 +10,10 @@ QT += gui-private platformsupport-private } +!contains(DEFINES, QT_NO_DBUS):greaterThan(QT_MINOR_VERSION, 5) { + QT += dbus +} + SOURCES += \ main.cpp \ qt5ctplatformtheme.cpp \ @@ -29,4 +33,3 @@ target.path = $$PLUGINDIR/platformthemes INSTALLS += target - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp new/qt5ct-0.33/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp --- old/qt5ct-0.31/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2017-03-28 10:48:03.000000000 +0200 +++ new/qt5ct-0.33/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2017-05-29 20:57:01.000000000 +0200 @@ -46,11 +46,16 @@ #include <qt5ct/qt5ct.h> #include "qt5ctplatformtheme.h" +#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) && !defined(QT_NO_DBUS) +#include <private/qdbusmenubar_p.h> +#endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) +#include <QDBusArgument> #include <private/qdbustrayicon_p.h> #endif + Q_LOGGING_CATEGORY(lqt5ct, "qt5ct") //QT_QPA_PLATFORMTHEME=qt5ct @@ -79,6 +84,19 @@ delete m_customPalette; } +#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) && !defined(QT_NO_DBUS) +QPlatformMenuBar *Qt5CTPlatformTheme::createPlatformMenuBar() const +{ + if(m_checkDBusGlobalMenu) + { + QDBusConnection conn = QDBusConnection::sessionBus(); + m_dbusGlobalMenuAvailable = conn.interface()->isServiceRegistered("com.canonical.AppMenu.Registrar"); + qCDebug(lqt5ct) << "D-Bus global menu:" << (m_dbusGlobalMenuAvailable ? "yes" : "no"); + } + return (m_dbusGlobalMenuAvailable ? new QDBusMenuBar() : nullptr); +} +#endif + #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) QPlatformSystemTrayIcon *Qt5CTPlatformTheme::createPlatformSystemTrayIcon() const { @@ -89,14 +107,14 @@ m_checkDBusTray = false; qCDebug(lqt5ct) << "D-Bus system tray:" << (m_dbusTrayAvailable ? "yes" : "no"); } - return (m_dbusTrayAvailable ? new QDBusTrayIcon() : 0); + return (m_dbusTrayAvailable ? new QDBusTrayIcon() : nullptr); } #endif const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const { Q_UNUSED(type); - return (m_usePalette ? m_customPalette : 0); + return (m_usePalette ? m_customPalette : nullptr); } const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const @@ -295,7 +313,7 @@ #ifdef QT_WIDGETS_LIB bool Qt5CTPlatformTheme::hasWidgets() { - return qobject_cast<QApplication *> (qApp) != 0; + return qobject_cast<QApplication *> (qApp) != nullptr; } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.31/src/qt5ct-qtplugin/qt5ctplatformtheme.h new/qt5ct-0.33/src/qt5ct-qtplugin/qt5ctplatformtheme.h --- old/qt5ct-0.31/src/qt5ct-qtplugin/qt5ctplatformtheme.h 2017-03-28 10:48:03.000000000 +0200 +++ new/qt5ct-0.33/src/qt5ct-qtplugin/qt5ctplatformtheme.h 2017-05-29 20:57:01.000000000 +0200 @@ -42,7 +42,13 @@ #endif class QPalette; +#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) class QPlatformSystemTrayIcon; +#endif + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) && !defined(QT_NO_DBUS) +class QPlatformMenuBar; +#endif class Qt5CTPlatformTheme : public QObject, public QPlatformTheme { @@ -55,7 +61,9 @@ //virtual QPlatformMenuItem* createPlatformMenuItem() const; //virtual QPlatformMenu* createPlatformMenu() const; - //virtual QPlatformMenuBar* createPlatformMenuBar() const; +#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) && !defined(QT_NO_DBUS) + virtual QPlatformMenuBar* createPlatformMenuBar() const; +#endif //virtual void showPlatformMenuBar() {} //virtual bool usePlatformNativeDialog(DialogType type) const; //virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const; @@ -98,6 +106,10 @@ bool m_usePalette = true; int m_toolButtonStyle = Qt::ToolButtonFollowStyle; int m_wheelScrollLines = 3; +#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) && !defined(QT_NO_DBUS) + mutable bool m_dbusGlobalMenuAvailable = false; + mutable bool m_checkDBusGlobalMenu = true; +#endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) mutable bool m_dbusTrayAvailable = false; mutable bool m_checkDBusTray = true;
