Hello community, here is the log from the commit of package qt5ct for openSUSE:Factory checked in at 2016-09-21 18:50:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt5ct (Old) and /work/SRC/openSUSE:Factory/.qt5ct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt5ct" Changes: -------- --- /work/SRC/openSUSE:Factory/qt5ct/qt5ct.changes 2016-09-07 11:47:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt5ct.new/qt5ct.changes 2016-09-21 18:50:35.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 20 20:50:25 UTC 2016 - [email protected] + +- Update to version 0.27: + * Add D-Bus tray support. + * Add a possibility to disable debug output. + * Update documentation. + +------------------------------------------------------------------- Old: ---- qt5ct-0.26.tar.bz2 New: ---- qt5ct-0.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt5ct.spec ++++++ --- /var/tmp/diff_new_pack.fB7is8/_old 2016-09-21 18:50:36.000000000 +0200 +++ /var/tmp/diff_new_pack.fB7is8/_new 2016-09-21 18:50:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: qt5ct -Version: 0.26 +Version: 0.27 Release: 0 Summary: Qt5 Configuration Tool License: BSD-2-Clause @@ -26,6 +26,7 @@ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: gcc-c++ BuildRequires: libQt5Gui-private-headers-devel >= 5.4.0 +BuildRequires: libQt5PlatformSupport-private-headers-devel >= 5.4.0 BuildRequires: libqt5-linguist >= 5.4.0 BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 ++++++ qt5ct-0.26.tar.bz2 -> qt5ct-0.27.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.26/ChangeLog new/qt5ct-0.27/ChangeLog --- old/qt5ct-0.26/ChangeLog 2016-09-05 08:37:49.000000000 +0200 +++ new/qt5ct-0.27/ChangeLog 2016-09-20 08:18:36.000000000 +0200 @@ -165,3 +165,8 @@ * fixed stellarium compatibility * updated French translation (Geiger David) * updated Greek translation (Dimitrios Glentadakis) + +Version 0.27 +* added D-Bus tray support +* added feature to disable debug output +* updated documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.26/ChangeLog.svn new/qt5ct-0.27/ChangeLog.svn --- old/qt5ct-0.26/ChangeLog.svn 2016-09-05 08:37:49.000000000 +0200 +++ new/qt5ct-0.27/ChangeLog.svn 2016-09-20 08:18:36.000000000 +0200 @@ -1,4 +1,36 @@ ------------------------------------------------------------------------ +r334 | trialuser02 | 2016-09-12 13:58:35 +0300 (Пн., 12 сент. 2016) | 1 line + +updated changelog +------------------------------------------------------------------------ +r333 | trialuser02 | 2016-09-12 13:50:49 +0300 (Пн., 12 сент. 2016) | 2 lines + +updated documentation + +------------------------------------------------------------------------ +r332 | trialuser02 | 2016-09-12 13:00:49 +0300 (Пн., 12 сент. 2016) | 1 line + +fixed previous commit +------------------------------------------------------------------------ +r331 | trialuser02 | 2016-09-12 12:08:18 +0300 (Пн., 12 сент. 2016) | 2 lines + +using QLoggingCategory class for logging + +------------------------------------------------------------------------ +r329 | trialuser02 | 2016-09-12 09:39:34 +0300 (Пн., 12 сент. 2016) | 2 lines + +fixed build without D-Bus support + +------------------------------------------------------------------------ +r328 | trialuser02 | 2016-09-12 09:38:08 +0300 (Пн., 12 сент. 2016) | 2 lines + +added D-Bus tray support + +------------------------------------------------------------------------ +r327 | trialuser02 | 2016-09-05 09:45:09 +0300 (Пн., 05 сент. 2016) | 1 line + +version bump +------------------------------------------------------------------------ r325 | trialuser02 | 2016-09-01 15:14:35 +0300 (Чт., 01 сент. 2016) | 1 line updated changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.26/README new/qt5ct-0.27/README --- old/qt5ct-0.26/README 2016-09-05 08:37:49.000000000 +0200 +++ new/qt5ct-0.27/README 2016-09-20 08:18:36.000000000 +0200 @@ -31,8 +31,17 @@ qmake DISABLE_WIDGETS=1 - compiles platform plugin without QtWidgets (useful for QML applications only) qmake PLUGINDIR=<custom path> - changes the install path of the platform plugin (libqt5ct.so) +Debug Messages: -Files and directories: +By default, platform plugin prints debug information to stderr. To disable this behaviour, you should +export the following environment variable: + +export QT_LOGGIN_RULES="qt5ct.debug=false" + +Another way is to change qtlogging.ini file. See Qt documentation for details: +http://doc.qt.io/qt-5/qloggingcategory.html (paragraph "Configuring Categories") + +Files and Directories: qt5ct - Qt5 configuration tool libqt5ct.so - qt5ct platform plugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.26/src/qt5ct/qt5ct.h new/qt5ct-0.27/src/qt5ct/qt5ct.h --- old/qt5ct-0.26/src/qt5ct/qt5ct.h 2016-09-05 08:37:49.000000000 +0200 +++ new/qt5ct-0.27/src/qt5ct/qt5ct.h 2016-09-20 08:18:36.000000000 +0200 @@ -30,7 +30,7 @@ #define QT5CT_H #define QT5CT_VERSION_MAJOR 0 -#define QT5CT_VERSION_MINOR 26 +#define QT5CT_VERSION_MINOR 27 #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.26/src/qt5ct-qtplugin/qt5ct-qtplugin.pro new/qt5ct-0.27/src/qt5ct-qtplugin/qt5ct-qtplugin.pro --- old/qt5ct-0.26/src/qt5ct-qtplugin/qt5ct-qtplugin.pro 2016-09-05 08:37:49.000000000 +0200 +++ new/qt5ct-0.27/src/qt5ct-qtplugin/qt5ct-qtplugin.pro 2016-09-20 08:18:36.000000000 +0200 @@ -4,7 +4,7 @@ TARGET = qt5ct CONFIG += plugin -QT += gui-private +QT += gui-private platformsupport-private SOURCES += \ main.cpp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.26/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp new/qt5ct-0.27/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp --- old/qt5ct-0.26/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2016-09-05 08:37:49.000000000 +0200 +++ new/qt5ct-0.27/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2016-09-20 08:18:36.000000000 +0200 @@ -29,7 +29,6 @@ #include <QVariant> #include <QSettings> #include <QGuiApplication> -#include <QDebug> #include <QScreen> #include <QFont> #include <QPalette> @@ -43,11 +42,16 @@ #endif #include <QFile> #include <QFileSystemWatcher> +#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) +#include <private/qdbustrayicon_p.h> +#endif #include <qt5ct/qt5ct.h> #include "qt5ctproxystyle.h" #include "qt5ctplatformtheme.h" +Q_LOGGING_CATEGORY(lqt5ct, "qt5ct") + //QT_QPA_PLATFORMTHEME=qt5ct Qt5CTPlatformTheme::Qt5CTPlatformTheme() @@ -55,6 +59,10 @@ m_customPalette = 0; m_update = false; m_usePalette = true; +#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) + m_dbusTrayAvailable = false; + m_checkDBusTray = true; +#endif if(QGuiApplication::desktopSettingsAware()) { readSettings(); @@ -67,7 +75,7 @@ #endif QGuiApplication::setFont(m_generalFont); } - qDebug("using qt5ct plugin"); + qCDebug(lqt5ct) << "using qt5ct plugin"; } Qt5CTPlatformTheme::~Qt5CTPlatformTheme() @@ -76,6 +84,20 @@ delete m_customPalette; } +#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) +QPlatformSystemTrayIcon *Qt5CTPlatformTheme::createPlatformSystemTrayIcon() const +{ + if(m_checkDBusTray) + { + QDBusMenuConnection conn; + m_dbusTrayAvailable = conn.isStatusNotifierHostRegistered(); + m_checkDBusTray = false; + qCDebug(lqt5ct) << "D-Bus system tray:" << (m_dbusTrayAvailable ? "yes" : "no"); + } + return (m_dbusTrayAvailable ? new QDBusTrayIcon() : 0); +} +#endif + const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const { if(m_customPalette && m_usePalette) @@ -124,7 +146,7 @@ if(QCoreApplication::testAttribute(Qt::AA_SetPalette)) { m_usePalette = false; - qDebug("qt5ct: palette support is disabled"); + qCDebug(lqt5ct) << "palette support is disabled"; } m_update = true; } @@ -149,7 +171,7 @@ if(m_prevStyleSheet == qApp->styleSheet()) qApp->setStyleSheet(m_userStyleSheet); else - qDebug("qt5ct: custom style sheet is disabled"); + qCDebug(lqt5ct) << "custom style sheet is disabled"; m_prevStyleSheet = m_userStyleSheet; } #endif @@ -185,7 +207,7 @@ void Qt5CTPlatformTheme::updateSettings() { - qDebug("Qt5CTPlatformTheme: updating settings.."); + qCDebug(lqt5ct) << "updating settings.."; readSettings(); applySettings(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.26/src/qt5ct-qtplugin/qt5ctplatformtheme.h new/qt5ct-0.27/src/qt5ct-qtplugin/qt5ctplatformtheme.h --- old/qt5ct-0.26/src/qt5ct-qtplugin/qt5ctplatformtheme.h 2016-09-05 08:37:49.000000000 +0200 +++ new/qt5ct-0.27/src/qt5ct-qtplugin/qt5ctplatformtheme.h 2016-09-20 08:18:36.000000000 +0200 @@ -33,8 +33,10 @@ #include <QObject> #include <QFont> #include <QPalette> +#include <QLoggingCategory> class QPalette; +class QPlatformSystemTrayIcon; class Qt5CTPlatformTheme : public QObject, public QPlatformTheme { @@ -51,6 +53,9 @@ //virtual void showPlatformMenuBar() {} //virtual bool usePlatformNativeDialog(DialogType type) const; //virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const; +#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) + virtual QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const; +#endif virtual const QPalette *palette(Palette type = SystemPalette) const; virtual const QFont *font(Font type = SystemFont) const; virtual QVariant themeHint(ThemeHint hint) const; @@ -85,6 +90,13 @@ int m_buttonBoxLayout; bool m_update; bool m_usePalette; +#if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) + mutable bool m_dbusTrayAvailable; + mutable bool m_checkDBusTray; +#endif + }; +Q_DECLARE_LOGGING_CATEGORY(lqt5ct) + #endif // QT5CTPLATFORMTHEME_H
