diff options
Diffstat (limited to 'configure.py')
| -rw-r--r-- | configure.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/configure.py b/configure.py index 30b117a..cf62865 100644 --- a/configure.py +++ b/configure.py @@ -1048,7 +1048,7 @@ def get_build_macros(overrides): overrides is a list of macros overrides from the user. """ - # Get the name of the qmake configuration file to take the macros from. + # Get the name of the tqmake configuration file to take the macros from. if "QMAKESPEC" in list(os.environ.keys()): fname = os.path.join(tqt_dir, "mkspecs", os.environ["QMAKESPEC"], "qmake.conf") else: @@ -1098,19 +1098,14 @@ def check_tqt_installation(macros): tqt_libdir = os.path.join(tqt_dir, "lib") macros["LIBDIR_TQT"] = tqt_libdir - # Check the TQt header files have been installed. Quietly check for TQt v4. - tqt4_d = os.path.join(tqt_incdir, "TQtCore") - - tqglobal = os.path.join(tqt4_d, "tqglobal.h") + # Check the TQt header files have been installed. + tqglobal = os.path.join(tqt_incdir, "tqglobal.h") if not os.access(tqglobal, os.F_OK): - tqglobal = os.path.join(tqt_incdir, "tqglobal.h") + tqglobal = os.path.join(tqt_incdir, "ntqglobal.h") if not os.access(tqglobal, os.F_OK): - tqglobal = os.path.join(tqt_incdir, "ntqglobal.h") - - if not os.access(tqglobal, os.F_OK): - sip_tqt_config.error("tqglobal.h or ntqglobal.h could not be found in %s." % tqt_incdir) + sip_tqt_config.error("tqglobal.h or ntqglobal.h could not be found in %s." % tqt_incdir) # Get the TQt version number. global tqt_version |