diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:12:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:12:44 -0600 |
| commit | e87fff3247e64b4e9509be991a8f2d6bd4ccfacc (patch) | |
| tree | 71a3198fc141420d65eefa7036159af85894cf7d /configure.py | |
| parent | 06500cd8e9be747a323920c9475fba0e6618d2de (diff) | |
| download | pytqt-e87fff3247e64b4e9509be991a8f2d6bd4ccfacc.tar.gz pytqt-e87fff3247e64b4e9509be991a8f2d6bd4ccfacc.zip | |
Update various qt function definitions and static methods for tqt3
Diffstat (limited to 'configure.py')
| -rw-r--r-- | configure.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.py b/configure.py index 4035b02..efe0589 100644 --- a/configure.py +++ b/configure.py @@ -315,7 +315,7 @@ class ConfigurePyTQt3(ConfigureBase): makefile.extra_defines.append("QT_INTERNAL_XML") if prof or "qtxml" not in pyqt_modules: - makefile.extra_defines.append("QT_MODULE_XML") + makefile.extra_defines.append("TQT_MODULE_XML") if qt_version < 0x030100: makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib") @@ -346,7 +346,7 @@ class ConfigurePyTQt3(ConfigureBase): makefile.extra_defines.append("QT_INTERNAL_XML") if prof or "qtxml" not in pyqt_modules: - makefile.extra_defines.append("QT_MODULE_XML") + makefile.extra_defines.append("TQT_MODULE_XML") makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate3")) @@ -709,7 +709,7 @@ int main(int argc,char **argv) fprintf(fp,"-x TQt_THREAD_SUPPORT\\n"); #endif -#if !defined(Q_WS_WIN) || QT_VERSION < 0x030000 || defined(QT_NO_STYLE_WINDOWSXP) +#if !defined(Q_WS_WIN) || TQT_VERSION < 0x030000 || defined(QT_NO_STYLE_WINDOWSXP) fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n"); #endif @@ -1119,7 +1119,7 @@ def check_qt_installation(macros): # Get the TQt version number. global qt_version - qt_version, ignore = sipconfig.read_version(qglobal, "TQt", "QT_VERSION") + qt_version, ignore = sipconfig.read_version(qglobal, "TQt", "TQT_VERSION") # Early versions of TQt for the Mac didn't include everything. Rather than # maintain these in the future we just mandate a later version. |