[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kajongg] src: On Windows, always use qt5
From:       Wolfgang Rohdewald <wolfgang () rohdewald ! de>
Date:       2016-12-03 9:17:40
Message-ID: E1cD6Rw-0002UT-Td () code ! kde ! org
[Download RAW message or body]

Git commit e27ac039d923bd46dac176309c7100614e538862 by Wolfgang Rohdewald.
Committed on 03/12/2016 at 09:16.
Pushed by wrohdewald into branch 'master'.

On Windows, always use qt5

M  +1    -1    src/kajongg.py
M  +2    -1    src/qt.py

https://commits.kde.org/kajongg/e27ac039d923bd46dac176309c7100614e538862

diff --git a/src/kajongg.py b/src/kajongg.py
index 9817cc8..ae2cd2e 100755
--- a/src/kajongg.py
+++ b/src/kajongg.py
@@ -94,7 +94,7 @@ def defineOptions():
         ki18n("Do not use KDE bindings. Intended only for testing"))
     options.add(
         "qt5",
-        ki18n("Force using Qt5. Currently Qt4 is used by default"))
+        ki18n("Force using Qt5. Currently Qt4 is used by default on Linux and Qt5 on Windows"))
     options.add(
         "socket <SOCKET>",
         ki18n("use a dedicated server listening on SOCKET. Intended only for testing"))
diff --git a/src/qt.py b/src/qt.py
index 9a180c1..6a94b6d 100644
--- a/src/qt.py
+++ b/src/qt.py
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # pylint: disable=invalid-name, wrong-import-position
 
 import sys
+import os
 
 import sip
 
@@ -30,7 +31,7 @@ from common import isPython3, Internal
 usingQt4 = True  # Default for now
 usingQt5 = False
 
-if '--qt5' in sys.argv:
+if '--qt5' in sys.argv or os.name == 'nt':
     try:
         from qt5 import *
         usingQt5 = True

[prev in list] [next in list] [prev in thread] [next in thread]