Fix FTBFS on TQt3

1 files changed, 18 insertions, 5 deletions

diff --git a/configure.py b/configure.py
index 42769f3..4035b02 100644
--- a/configure.py
+++ b/configure.py
@@ -227,7 +227,10 @@ class ConfigurePyTQt3(ConfigureBase):
             if check_class("qassistantclient.h", "TQAssistantClient(\"foo\")", lib="qassistantclient"):
                 qtmod_lib = "qassistantclient"
             else:
-                disabled_classes.append("TQAssistantClient")
+                if check_class("ntqassistantclient.h", "TQAssistantClient(\"foo\")", lib="qassistantclient"):
+                    qtmod_lib = "qassistantclient"
+                else:
+                    disabled_classes.append("TQAssistantClient")
 
         return qtmod_lib
 
@@ -615,6 +618,9 @@ def check_module(mname, incfile, ctor, define=None, include_dir=None, lib_dir=No
 
         if check_class(incfile, ctor, define, include_dir, lib_dir, lib, opengl):
             pyqt_modules.append(mname)
+        else:
+            if check_class("nt" + incfile, ctor, define, include_dir, lib_dir, lib, opengl):
+                pyqt_modules.append(mname)
 
 
 def check_class(incfile, ctor, define=None, include_dir=None, lib_dir=None, lib=None, opengl=0):
@@ -762,8 +768,9 @@ int main(int argc,char **argv)
 
     for (feat, incfile, cname) in plugins:
         if not check_plugin(cname, incfile):
-            f.write("-x TQt_%s\n" % feat)
-            disabled_classes.append(cname)
+            if not check_plugin(cname, "nt" + incfile):
+                f.write("-x TQt_%s\n" % feat)
+                disabled_classes.append(cname)
 
     f.close()
 
@@ -1104,7 +1111,10 @@ def check_qt_installation(macros):
         qglobal = os.path.join(qt_incdir, "qglobal.h")
 
         if not os.access(qglobal, os.F_OK):
-            sipconfig.error("qglobal.h could not be found in %s." % qt_incdir)
+            qglobal = os.path.join(qt_incdir, "ntqglobal.h")
+
+            if not os.access(qglobal, os.F_OK):
+                sipconfig.error("qglobal.h or ntqglobal.h could not be found in %s." % qt_incdir)
 
     # Get the TQt version number.
     global qt_version
@@ -1137,7 +1147,10 @@ def check_qt_installation(macros):
         qconfig = os.path.join(qconfigdir, "qconfig.h")
 
         if not os.access(qconfig,os.F_OK):
-            sipconfig.error("qconfig.h could not be found in %s." % qconfigdir)
+            qconfig = os.path.join(qconfigdir, "ntqconfig.h")
+
+            if not os.access(qconfig,os.F_OK):
+                sipconfig.error("qconfig.h or ntqconfig.h could not be found in %s." % qconfigdir)
 
         f = open(qconfig)
         l = f.readline()