This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 71c57032d5a047bb34ffae392f00b891571c6d41 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Apr 2 06:11:34 2016 +0200 src/{ongetpass,onmainwindow}.cpp: fixup QPlastiqueStyle usage on Qt5. This particular style has been removed/replaced by Fusion, which incorporates features of both Plastique and Clearlooks styles. --- debian/changelog | 3 +++ src/ongetpass.cpp | 2 ++ src/onmainwindow.cpp | 7 +++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d23299a..d845a27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium original messages' format, typo fixes and other changes. - res/i18n/x2goclient_fi.ts: fixup translation by respecting the original messages' format and other changes. + - src/{ongetpass,onmainwindow}.cpp: fixup QPlastiqueStyle usage on Qt5. + This particular style has been removed/replaced by Fusion, which + incorporates features of both Plastique and Clearlooks styles. [ Mike DePaulo ] * New upstream release (4.0.5.2): diff --git a/src/ongetpass.cpp b/src/ongetpass.cpp index 464de0f..9b80537 100644 --- a/src/ongetpass.cpp +++ b/src/ongetpass.cpp @@ -55,6 +55,8 @@ int x2goMain ( int argc, char *argv[] ) #ifdef Q_OS_LINUX #if QT_VERSION < 0x050000 app.setStyle ( new QPlastiqueStyle() ); +#else + app.setStyle ("fusion"); #endif #endif #endif diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 3f2df15..fedd594 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -218,9 +218,12 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) addToAppNames ( "OFFICE",tr ( "OpenOffice.org" ) ); addToAppNames ( "TERMINAL",tr ( "Terminal" ) ); - #ifndef Q_OS_LINUX - widgetExtraStyle =new QPlastiqueStyle(); +#if QT_VERSION < 0x050000 + widgetExtraStyle = new QPlastiqueStyle (); +#else + widgetExtraStyle = QStyleFactory::create ("fusion"); +#endif #endif agentCheckTimer=new QTimer ( this ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git