|
 |
57bfdcc |
diff -rupN --no-dereference PyQt5-5.13.2/configure.py PyQt5-5.13.2-new/configure.py
|
|
 |
57bfdcc |
--- PyQt5-5.13.2/configure.py 2019-11-05 13:58:20.809612230 +0100
|
|
 |
57bfdcc |
+++ PyQt5-5.13.2-new/configure.py 2019-11-05 13:58:20.812612222 +0100
|
|
 |
3a0ae22 |
@@ -506,7 +506,7 @@ class TargetConfiguration:
|
|
 |
447c66f |
self.py_inc_dir = py_config.inc_dir
|
|
 |
447c66f |
self.py_venv_inc_dir = py_config.venv_inc_dir
|
|
 |
447c66f |
self.py_lib_dir = py_config.lib_dir
|
|
 |
0626210 |
- self.py_platform = py_config.platform
|
|
 |
0626210 |
+ self.py_platform = 'win32-g++'
|
|
 |
0626210 |
self.py_version = py_config.version
|
|
 |
447c66f |
self.pyqt_bin_dir = py_config.bin_dir
|
|
 |
447c66f |
self.pyqt_module_dir = py_config.module_dir
|
|
 |
3a0ae22 |
@@ -996,7 +996,7 @@ class TargetConfiguration:
|
|
 |
b8ee76d |
# it where it is.
|
|
 |
b8ee76d |
if not self.static:
|
|
 |
b8ee76d |
pro_lines.extend(['win32 {',
|
|
 |
b8ee76d |
- ' LIBS += ' + self.get_pylib_link_arguments(name=False),
|
|
 |
b8ee76d |
+ ' LIBS += ' + self.get_pylib_link_arguments(name=True),
|
|
 |
b8ee76d |
'}'])
|
|
 |
b8ee76d |
|
|
 |
e9f6963 |
def using_sip5(self):
|
|
 |
e9f6963 |
@@ -1398,8 +1398,8 @@ def check_5_1_modules(target_config, dis
|
|
 |
0626210 |
'qsensor.h', 'new QSensor(QByteArray())')
|
|
 |
0626210 |
check_module(target_config, disabled_modules, verbose, 'QtSerialPort',
|
|
 |
0626210 |
'qserialport.h', 'new QSerialPort()')
|
|
 |
0626210 |
- check_module(target_config, disabled_modules, verbose, 'QtX11Extras',
|
|
 |
0626210 |
- 'QX11Info', 'QX11Info::display()')
|
|
 |
0626210 |
+ #check_module(target_config, disabled_modules, verbose, 'QtX11Extras',
|
|
 |
0626210 |
+ # 'QX11Info', 'QX11Info::display()')
|
|
 |
0626210 |
|
|
 |
0626210 |
|
|
 |
0626210 |
def check_5_2_modules(target_config, disabled_modules, verbose):
|
|
 |
57bfdcc |
@@ -1905,7 +1905,7 @@ def pro_sources(src_dir, other_headers=N
|
|
 |
0a3ae74 |
def module_file_name(target_config, name):
|
|
 |
0a3ae74 |
""" Return the name of a file implementing a module. """
|
|
 |
a2040db |
|
|
 |
0a3ae74 |
- if sys.platform == 'win32':
|
|
 |
0a3ae74 |
+ if True:
|
|
 |
0a3ae74 |
fs = '{}.lib' if target_config.static else '{}.pyd'
|
|
 |
0a3ae74 |
else:
|
|
 |
0a3ae74 |
fs = 'lib{}.a' if target_config.static else '{}.so'
|
|
 |
57bfdcc |
@@ -2121,11 +2121,11 @@ def run_make(target_config, verbose, exe
|
|
 |
0626210 |
|
|
 |
0626210 |
# Guess the name of make and set the default target and platform specific
|
|
 |
0626210 |
# name of the executable.
|
|
 |
0626210 |
- if target_config.py_platform == 'win32':
|
|
 |
0626210 |
- if target_config.qmake_spec == 'win32-g++':
|
|
 |
0626210 |
- make = 'mingw32-make'
|
|
 |
0626210 |
- else:
|
|
 |
0626210 |
+ if target_config.py_platform.startswith('win32'):
|
|
 |
0626210 |
+ if target_config.qmake_spec.startswith('win32-msvc'):
|
|
 |
0626210 |
make = 'nmake'
|
|
 |
0626210 |
+ else:
|
|
 |
0626210 |
+ make = 'make'
|
|
 |
0626210 |
|
|
 |
0626210 |
if target_config.debug:
|
|
 |
0626210 |
makefile_target = 'debug'
|
|
 |
57bfdcc |
@@ -2398,6 +2398,19 @@ def compile_test_program(target_config,
|
|
 |
0626210 |
|
|
 |
0626210 |
metadata = MODULE_METADATA[mname]
|
|
 |
0626210 |
|
|
 |
447c66f |
+ # Create a host configuration to run test programs
|
|
 |
447c66f |
+ target_config = TargetConfiguration()
|
|
 |
447c66f |
+ py_major = target_config.py_version >> 16
|
|
 |
447c66f |
+ py_minor = (target_config.py_version >> 8) & 0x0ff
|
|
 |
447c66f |
+ pyver = '%d.%d%s' % (py_major, py_minor, getattr(sys, 'abiflags', ''))
|
|
 |
447c66f |
+ target_config.qmake = "qmake-qt5"
|
|
 |
447c66f |
+ target_config.qmake_spec = "linux-g++"
|
|
 |
447c66f |
+ target_config.py_platform = "linux"
|
|
 |
447c66f |
+ target_config.qmake_variables = ""
|
|
 |
447c66f |
+ target_config.sip = "/usr/bin/sip"
|
|
 |
447c66f |
+ target_config.sip_inc_dir = "/usr/include/python%s/" % pyver
|
|
 |
447c66f |
+ target_config.py_inc_dir = "/usr/include/python%s/" % pyver
|
|
 |
447c66f |
+
|
|
 |
0626210 |
# The derived file names.
|
|
 |
447c66f |
name = 'cfgtest_' + mname
|
|
 |
447c66f |
name_pro = name + '.pro'
|