[X2Go-Commits] [pinentry-x2go] 02/14: Port to Qt5.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pinentry-x2go.

commit b4542ae7765763d2eeba6d9f67eab5f337a19cea
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 11 13:19:28 2018 +0100

    Port to Qt5.
---
 configure.ac                    | 4 ++--
 debian/changelog                | 1 +
 pinentry-x2go/main.cpp          | 8 +-------
 pinentry-x2go/pinentry-x2go.pro | 3 ++-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8730a84..b541103 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,10 +145,10 @@ Makefile
 
 AC_OUTPUT
 
-for lrelease in $(which lrelease-qt4 lrelease 2>/dev/null); do
+for lrelease in $(which lrelease lrelease-qt5 lrelease-qt4 2>/dev/null); do
   break;
 done;
-for qmake in $(which qmake-qt4 qmake 2>/dev/null); do
+for qmake in $(which qmake qmake-qt5 qmake-qt4 2>/dev/null); do
   break;
 done;
 if test -z "$lrelease"; then
diff --git a/debian/changelog b/debian/changelog
index af4732b..a9f4f36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ pinentry-x2go (0.7.5.10-0x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * New upstream version (0.7.5.10):
     - Add man page for pinentry-x2go.
+    - Port to / support Qt5.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Sun, 07 Jun 2015 00:31:14 +0200
 
diff --git a/pinentry-x2go/main.cpp b/pinentry-x2go/main.cpp
index ecbc812..4ac754e 100644
--- a/pinentry-x2go/main.cpp
+++ b/pinentry-x2go/main.cpp
@@ -39,8 +39,6 @@
 
 #include <QTranslator>
 #include <QLocale>
-#include <QPlastiqueStyle>
-
 
 #include "pinentrydialog.h"
 
@@ -218,11 +216,7 @@ main (int argc, char *argv[])
     else
       app->installTranslator(&qtTranslator);
 
-
-
-    app->setStyle(new QPlastiqueStyle());
-
-
+    app->setStyle("fusion");
 
     /* Consumes all arguments.  */
     if (pinentry_parse_opts (argc, argv))
diff --git a/pinentry-x2go/pinentry-x2go.pro b/pinentry-x2go/pinentry-x2go.pro
index f8b4edd..c46dac3 100644
--- a/pinentry-x2go/pinentry-x2go.pro
+++ b/pinentry-x2go/pinentry-x2go.pro
@@ -19,9 +19,10 @@ TRANSLATIONS += pinentry-x2go_da.ts \
                 pinentry-x2go_zh_tw.ts
 
 TEMPLATE = app
-TARGET = 
+TARGET = pinentry-x2go
 DEPENDPATH += .
 INCLUDEPATH += .
+QT += widgets
 
 # Input
 HEADERS += pinentrydialog.h pinlineedit.h

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git