diff options
Diffstat (limited to 'configure.py')
| -rw-r--r-- | configure.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.py b/configure.py index 133f1ae..39057b6 100644 --- a/configure.py +++ b/configure.py @@ -41,7 +41,7 @@ sip_min_version = 0x040800 # Try and find a TQt installation to use as the default. try: - qt_dir = os.environ["QTDIR"] + qt_dir = os.environ["TQTDIR"] except KeyError: qt_dir = "" @@ -1070,12 +1070,12 @@ def get_build_macros(overrides): # Add the TQt specific macros to the default. names = sipcfg.build_macros().keys() - names.append("INCDIR_QT") - names.append("LIBDIR_QT") + names.append("INCDIR_TQT") + names.append("LIBDIR_TQT") names.append("MOC") - # Make sure $QTDIR reflects any directory passed on the command line. - os.environ["QTDIR"] = qt_dir + # Make sure $TQTDIR reflects any directory passed on the command line. + os.environ["TQTDIR"] = qt_dir properties = { "QT_INSTALL_BINS": os.path.join(qt_dir, "bin"), @@ -1097,17 +1097,17 @@ def check_qt_installation(macros): # Set the TQt include and lib directories. global qt_incdir, qt_libdir - qt_incdir = macros["INCDIR_QT"] + qt_incdir = macros["INCDIR_TQT"] if not qt_incdir: qt_incdir = os.path.join(qt_dir, "include") - macros["INCDIR_QT"] = qt_incdir + macros["INCDIR_TQT"] = qt_incdir - qt_libdir = macros["LIBDIR_QT"] + qt_libdir = macros["LIBDIR_TQT"] if not qt_libdir: qt_libdir = os.path.join(qt_dir, "lib") - macros["LIBDIR_QT"] = qt_libdir + macros["LIBDIR_TQT"] = qt_libdir # Check the TQt header files have been installed. Quietly check for TQt v4. qt4_d = os.path.join(qt_incdir, "TQtCore") @@ -1399,7 +1399,7 @@ def main(argv): # Check that we know the name of the TQt root directory. if not qt_dir: - sipconfig.error("A TQt installation could not be found. Use use the -q argument or the QTDIR environment variable to explicitly specify the correct directory.") + sipconfig.error("A TQt installation could not be found. Use use the -q argument or the TQTDIR environment variable to explicitly specify the correct directory.") # When building static libraries, signed interpreter checking makes no # sense. |