Fix FTBFS on TQt3

29 files changed, 46 insertions, 33 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()
diff --git a/sip/qtext/qextscintilla.sip b/sip/qtext/qextscintilla.sip
index 82260c4..e7609b9 100644
--- a/sip/qtext/qextscintilla.sip
+++ b/sip/qtext/qextscintilla.sip
@@ -27,7 +27,7 @@
 class QextScintilla : QextScintillaBase
 {
 %TypeHeaderCode
-#include <tqextscintilla.h>
+#include <qextscintilla.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillaapis.sip b/sip/qtext/qextscintillaapis.sip
index f19af01..8d92e26 100644
--- a/sip/qtext/qextscintillaapis.sip
+++ b/sip/qtext/qextscintillaapis.sip
@@ -27,7 +27,7 @@
 class QextScintillaAPIs
 {
 %TypeHeaderCode
-#include <tqextscintillaapis.h>
+#include <qextscintillaapis.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillabase.sip b/sip/qtext/qextscintillabase.sip
index 1fc9bdc..a309ee7 100644
--- a/sip/qtext/qextscintillabase.sip
+++ b/sip/qtext/qextscintillabase.sip
@@ -27,7 +27,7 @@
 class QextScintillaBase : TQWidget
 {
 %TypeHeaderCode
-#include <tqextscintillabase.h>
+#include <qextscintillabase.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillacommand.sip b/sip/qtext/qextscintillacommand.sip
index f7efbc8..b423a5b 100644
--- a/sip/qtext/qextscintillacommand.sip
+++ b/sip/qtext/qextscintillacommand.sip
@@ -27,7 +27,7 @@
 class QextScintillaCommand
 {
 %TypeHeaderCode
-#include <tqextscintillacommand.h>
+#include <qextscintillacommand.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillacommandset.sip b/sip/qtext/qextscintillacommandset.sip
index 26ae97e..8d04f82 100644
--- a/sip/qtext/qextscintillacommandset.sip
+++ b/sip/qtext/qextscintillacommandset.sip
@@ -27,7 +27,7 @@
 class QextScintillaCommandSet
 {
 %TypeHeaderCode
-#include <tqextscintillacommandset.h>
+#include <qextscintillacommandset.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintilladocument.sip b/sip/qtext/qextscintilladocument.sip
index a8086a6..f66166d 100644
--- a/sip/qtext/qextscintilladocument.sip
+++ b/sip/qtext/qextscintilladocument.sip
@@ -29,7 +29,7 @@
 class QextScintillaDocument
 {
 %TypeHeaderCode
-#include <tqextscintilladocument.h>
+#include <qextscintilladocument.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexer.sip b/sip/qtext/qextscintillalexer.sip
index 6601906..4ab290a 100644
--- a/sip/qtext/qextscintillalexer.sip
+++ b/sip/qtext/qextscintillalexer.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexer : TQObject
 {
 %TypeHeaderCode
-#include <tqextscintillalexer.h>
+#include <qextscintillalexer.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerbash.sip b/sip/qtext/qextscintillalexerbash.sip
index 0dd2d02..eb71b13 100644
--- a/sip/qtext/qextscintillalexerbash.sip
+++ b/sip/qtext/qextscintillalexerbash.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerBash : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerbash.h>
+#include <qextscintillalexerbash.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerbatch.sip b/sip/qtext/qextscintillalexerbatch.sip
index 990d6ed..aa20a4f 100644
--- a/sip/qtext/qextscintillalexerbatch.sip
+++ b/sip/qtext/qextscintillalexerbatch.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerBatch : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerbatch.h>
+#include <qextscintillalexerbatch.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexercpp.sip b/sip/qtext/qextscintillalexercpp.sip
index 8d41dd0..3ce192d 100644
--- a/sip/qtext/qextscintillalexercpp.sip
+++ b/sip/qtext/qextscintillalexercpp.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerCPP : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexercpp.h>
+#include <qextscintillalexercpp.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexercsharp.sip b/sip/qtext/qextscintillalexercsharp.sip
index 1734289..f095269 100644
--- a/sip/qtext/qextscintillalexercsharp.sip
+++ b/sip/qtext/qextscintillalexercsharp.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerCSharp : QextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <tqextscintillalexercsharp.h>
+#include <qextscintillalexercsharp.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexercss.sip b/sip/qtext/qextscintillalexercss.sip
index 9dd72e1..e54b5e1 100644
--- a/sip/qtext/qextscintillalexercss.sip
+++ b/sip/qtext/qextscintillalexercss.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerCSS : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexercss.h>
+#include <qextscintillalexercss.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerdiff.sip b/sip/qtext/qextscintillalexerdiff.sip
index 31ae4ab..49d82ad 100644
--- a/sip/qtext/qextscintillalexerdiff.sip
+++ b/sip/qtext/qextscintillalexerdiff.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerDiff : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerdiff.h>
+#include <qextscintillalexerdiff.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerhtml.sip b/sip/qtext/qextscintillalexerhtml.sip
index d0aad95..deb7320 100644
--- a/sip/qtext/qextscintillalexerhtml.sip
+++ b/sip/qtext/qextscintillalexerhtml.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerHTML : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerhtml.h>
+#include <qextscintillalexerhtml.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexeridl.sip b/sip/qtext/qextscintillalexeridl.sip
index 8ab42d9..408d3fe 100644
--- a/sip/qtext/qextscintillalexeridl.sip
+++ b/sip/qtext/qextscintillalexeridl.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerIDL : QextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <tqextscintillalexeridl.h>
+#include <qextscintillalexeridl.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerjava.sip b/sip/qtext/qextscintillalexerjava.sip
index edacf64..dbb8b03 100644
--- a/sip/qtext/qextscintillalexerjava.sip
+++ b/sip/qtext/qextscintillalexerjava.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerJava : QextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <tqextscintillalexerjava.h>
+#include <qextscintillalexerjava.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerjavascript.sip b/sip/qtext/qextscintillalexerjavascript.sip
index 551e3eb..a19b902 100644
--- a/sip/qtext/qextscintillalexerjavascript.sip
+++ b/sip/qtext/qextscintillalexerjavascript.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerJavaScript : QextScintillaLexerCPP
 {
 %TypeHeaderCode
-#include <tqextscintillalexerjavascript.h>
+#include <qextscintillalexerjavascript.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerlua.sip b/sip/qtext/qextscintillalexerlua.sip
index 9983cce..12c725f 100644
--- a/sip/qtext/qextscintillalexerlua.sip
+++ b/sip/qtext/qextscintillalexerlua.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerLua : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerlua.h>
+#include <qextscintillalexerlua.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexermakefile.sip b/sip/qtext/qextscintillalexermakefile.sip
index 8a28358..90d210e 100644
--- a/sip/qtext/qextscintillalexermakefile.sip
+++ b/sip/qtext/qextscintillalexermakefile.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerMakefile : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexermakefile.h>
+#include <qextscintillalexermakefile.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerperl.sip b/sip/qtext/qextscintillalexerperl.sip
index bc7f521..06bdd7c 100644
--- a/sip/qtext/qextscintillalexerperl.sip
+++ b/sip/qtext/qextscintillalexerperl.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerPerl : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerperl.h>
+#include <qextscintillalexerperl.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerpov.sip b/sip/qtext/qextscintillalexerpov.sip
index 9489f26..6812baa 100644
--- a/sip/qtext/qextscintillalexerpov.sip
+++ b/sip/qtext/qextscintillalexerpov.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerPOV : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerpov.h>
+#include <qextscintillalexerpov.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerproperties.sip b/sip/qtext/qextscintillalexerproperties.sip
index 847394f..b880ce9 100644
--- a/sip/qtext/qextscintillalexerproperties.sip
+++ b/sip/qtext/qextscintillalexerproperties.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerProperties : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerproperties.h>
+#include <qextscintillalexerproperties.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerpython.sip b/sip/qtext/qextscintillalexerpython.sip
index 842bb2a..5e3b883 100644
--- a/sip/qtext/qextscintillalexerpython.sip
+++ b/sip/qtext/qextscintillalexerpython.sip
@@ -27,7 +27,7 @@
 class QextScintillaLexerPython : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerpython.h>
+#include <qextscintillalexerpython.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexerruby.sip b/sip/qtext/qextscintillalexerruby.sip
index dfbc7f4..f7c0a99 100644
--- a/sip/qtext/qextscintillalexerruby.sip
+++ b/sip/qtext/qextscintillalexerruby.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerRuby : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexerruby.h>
+#include <qextscintillalexerruby.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexersql.sip b/sip/qtext/qextscintillalexersql.sip
index f4b5459..5f601eb 100644
--- a/sip/qtext/qextscintillalexersql.sip
+++ b/sip/qtext/qextscintillalexersql.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerSQL : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexersql.h>
+#include <qextscintillalexersql.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillalexertex.sip b/sip/qtext/qextscintillalexertex.sip
index 9450286..8320b59 100644
--- a/sip/qtext/qextscintillalexertex.sip
+++ b/sip/qtext/qextscintillalexertex.sip
@@ -29,7 +29,7 @@
 class QextScintillaLexerTeX : QextScintillaLexer
 {
 %TypeHeaderCode
-#include <tqextscintillalexertex.h>
+#include <qextscintillalexertex.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillamacro.sip b/sip/qtext/qextscintillamacro.sip
index 1876af4..d5261f1 100644
--- a/sip/qtext/qextscintillamacro.sip
+++ b/sip/qtext/qextscintillamacro.sip
@@ -27,7 +27,7 @@
 class QextScintillaMacro : TQObject
 {
 %TypeHeaderCode
-#include <tqextscintillamacro.h>
+#include <qextscintillamacro.h>
 %End
 
 public:
diff --git a/sip/qtext/qextscintillaprinter.sip b/sip/qtext/qextscintillaprinter.sip
index 2d5b9bb..b19a312 100644
--- a/sip/qtext/qextscintillaprinter.sip
+++ b/sip/qtext/qextscintillaprinter.sip
@@ -27,7 +27,7 @@
 class QextScintillaPrinter : TQPrinter
 {
 %TypeHeaderCode
-#include <tqextscintillaprinter.h>
+#include <qextscintillaprinter.h>
 %End
 
 public: