Browse Source

Fix FTBFS on TQt3

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
06500cd8e9
29 changed files with 46 additions and 33 deletions
  1. +18
    -5
      configure.py
  2. +1
    -1
      sip/qtext/qextscintilla.sip
  3. +1
    -1
      sip/qtext/qextscintillaapis.sip
  4. +1
    -1
      sip/qtext/qextscintillabase.sip
  5. +1
    -1
      sip/qtext/qextscintillacommand.sip
  6. +1
    -1
      sip/qtext/qextscintillacommandset.sip
  7. +1
    -1
      sip/qtext/qextscintilladocument.sip
  8. +1
    -1
      sip/qtext/qextscintillalexer.sip
  9. +1
    -1
      sip/qtext/qextscintillalexerbash.sip
  10. +1
    -1
      sip/qtext/qextscintillalexerbatch.sip
  11. +1
    -1
      sip/qtext/qextscintillalexercpp.sip
  12. +1
    -1
      sip/qtext/qextscintillalexercsharp.sip
  13. +1
    -1
      sip/qtext/qextscintillalexercss.sip
  14. +1
    -1
      sip/qtext/qextscintillalexerdiff.sip
  15. +1
    -1
      sip/qtext/qextscintillalexerhtml.sip
  16. +1
    -1
      sip/qtext/qextscintillalexeridl.sip
  17. +1
    -1
      sip/qtext/qextscintillalexerjava.sip
  18. +1
    -1
      sip/qtext/qextscintillalexerjavascript.sip
  19. +1
    -1
      sip/qtext/qextscintillalexerlua.sip
  20. +1
    -1
      sip/qtext/qextscintillalexermakefile.sip
  21. +1
    -1
      sip/qtext/qextscintillalexerperl.sip
  22. +1
    -1
      sip/qtext/qextscintillalexerpov.sip
  23. +1
    -1
      sip/qtext/qextscintillalexerproperties.sip
  24. +1
    -1
      sip/qtext/qextscintillalexerpython.sip
  25. +1
    -1
      sip/qtext/qextscintillalexerruby.sip
  26. +1
    -1
      sip/qtext/qextscintillalexersql.sip
  27. +1
    -1
      sip/qtext/qextscintillalexertex.sip
  28. +1
    -1
      sip/qtext/qextscintillamacro.sip
  29. +1
    -1
      sip/qtext/qextscintillaprinter.sip

+ 18
- 5
configure.py View File

@@ -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()


+ 1
- 1
sip/qtext/qextscintilla.sip View File

@@ -27,7 +27,7 @@
class QextScintilla : QextScintillaBase
{
%TypeHeaderCode
#include <tqextscintilla.h>
#include <qextscintilla.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillaapis.sip View File

@@ -27,7 +27,7 @@
class QextScintillaAPIs
{
%TypeHeaderCode
#include <tqextscintillaapis.h>
#include <qextscintillaapis.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillabase.sip View File

@@ -27,7 +27,7 @@
class QextScintillaBase : TQWidget
{
%TypeHeaderCode
#include <tqextscintillabase.h>
#include <qextscintillabase.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillacommand.sip View File

@@ -27,7 +27,7 @@
class QextScintillaCommand
{
%TypeHeaderCode
#include <tqextscintillacommand.h>
#include <qextscintillacommand.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillacommandset.sip View File

@@ -27,7 +27,7 @@
class QextScintillaCommandSet
{
%TypeHeaderCode
#include <tqextscintillacommandset.h>
#include <qextscintillacommandset.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintilladocument.sip View File

@@ -29,7 +29,7 @@
class QextScintillaDocument
{
%TypeHeaderCode
#include <tqextscintilladocument.h>
#include <qextscintilladocument.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexer.sip View File

@@ -27,7 +27,7 @@
class QextScintillaLexer : TQObject
{
%TypeHeaderCode
#include <tqextscintillalexer.h>
#include <qextscintillalexer.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerbash.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerBash : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerbash.h>
#include <qextscintillalexerbash.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerbatch.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerBatch : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerbatch.h>
#include <qextscintillalexerbatch.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexercpp.sip View File

@@ -27,7 +27,7 @@
class QextScintillaLexerCPP : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexercpp.h>
#include <qextscintillalexercpp.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexercsharp.sip View File

@@ -27,7 +27,7 @@
class QextScintillaLexerCSharp : QextScintillaLexerCPP
{
%TypeHeaderCode
#include <tqextscintillalexercsharp.h>
#include <qextscintillalexercsharp.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexercss.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerCSS : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexercss.h>
#include <qextscintillalexercss.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerdiff.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerDiff : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerdiff.h>
#include <qextscintillalexerdiff.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerhtml.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerHTML : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerhtml.h>
#include <qextscintillalexerhtml.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexeridl.sip View File

@@ -27,7 +27,7 @@
class QextScintillaLexerIDL : QextScintillaLexerCPP
{
%TypeHeaderCode
#include <tqextscintillalexeridl.h>
#include <qextscintillalexeridl.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerjava.sip View File

@@ -27,7 +27,7 @@
class QextScintillaLexerJava : QextScintillaLexerCPP
{
%TypeHeaderCode
#include <tqextscintillalexerjava.h>
#include <qextscintillalexerjava.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerjavascript.sip View File

@@ -27,7 +27,7 @@
class QextScintillaLexerJavaScript : QextScintillaLexerCPP
{
%TypeHeaderCode
#include <tqextscintillalexerjavascript.h>
#include <qextscintillalexerjavascript.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerlua.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerLua : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerlua.h>
#include <qextscintillalexerlua.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexermakefile.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerMakefile : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexermakefile.h>
#include <qextscintillalexermakefile.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerperl.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerPerl : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerperl.h>
#include <qextscintillalexerperl.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerpov.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerPOV : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerpov.h>
#include <qextscintillalexerpov.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerproperties.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerProperties : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerproperties.h>
#include <qextscintillalexerproperties.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerpython.sip View File

@@ -27,7 +27,7 @@
class QextScintillaLexerPython : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerpython.h>
#include <qextscintillalexerpython.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexerruby.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerRuby : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexerruby.h>
#include <qextscintillalexerruby.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexersql.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerSQL : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexersql.h>
#include <qextscintillalexersql.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillalexertex.sip View File

@@ -29,7 +29,7 @@
class QextScintillaLexerTeX : QextScintillaLexer
{
%TypeHeaderCode
#include <tqextscintillalexertex.h>
#include <qextscintillalexertex.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillamacro.sip View File

@@ -27,7 +27,7 @@
class QextScintillaMacro : TQObject
{
%TypeHeaderCode
#include <tqextscintillamacro.h>
#include <qextscintillamacro.h>
%End

public:


+ 1
- 1
sip/qtext/qextscintillaprinter.sip View File

@@ -27,7 +27,7 @@
class QextScintillaPrinter : TQPrinter
{
%TypeHeaderCode
#include <tqextscintillaprinter.h>
#include <qextscintillaprinter.h>
%End

public:


Loading…
Cancel
Save