From 42cf2b0d14161472ace9b5c7119b850be8e93741 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 28 Jan 2012 01:49:15 -0600
Subject: [PATCH] Update tqt3 compat

---
 ConfigureChecks.cmake      |   6 +-
 qtinterface/CMakeLists.txt | 246 +++++++++++++++++++------------------
 qtinterface/tqt.h.cmake    |   6 +
 3 files changed, 133 insertions(+), 125 deletions(-)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index ff5fe8c..0f320c2 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -173,7 +173,7 @@ if( QT_VERSION STREQUAL "3" )
       set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIR} ${QT_LIBRARIES} )
       qt_message( "Looking for native TQt3..." )
       check_cxx_source_compiles("
-        #include <qapplication.h>
+        #include <ntqapplication.h>
         int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } "
         HAVE_USABLE_QT${QT_VERSION} )
     endif( )
@@ -203,8 +203,8 @@ if( QT_VERSION STREQUAL "3" )
       set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIR} ${QT_LIBRARIES} )
       qt_message( "Looking for patched native TQt3..." )
       check_cxx_source_compiles("
-        #include <qobjectlist.h>
-        #include <qobject.h>
+        #include <ntqobjectlist.h>
+        #include <ntqobject.h>
         int main(int, char**) { TQObject::objectTreesListObject(); return 0; } "
         HAVE_PATCHED_QT3 )
     endif( )
diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
index 0596911..d347259 100644
--- a/qtinterface/CMakeLists.txt
+++ b/qtinterface/CMakeLists.txt
@@ -2,6 +2,8 @@
 #
 #  (C) 2010-2011 Serghei Amelian
 #  serghei (DOT) amelian (AT) gmail.com
+#  (C) 2011-2012 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing (DOT) net
 #
 #  Improvements and feedback are welcome
 #
@@ -23,78 +25,78 @@ link_directories(
 
 ##### headers ###################################
 
-configure_file( tqt.h.cmake tqt.h @ONLY )
-
 if ( NOT HAVE_REAL_TQT )
   set( IFACE "interface_qt3" )
 else ( NOT HAVE_REAL_TQT )
   set( IFACE "interface_tqt3" )
 endif ( NOT HAVE_REAL_TQT )
 
+configure_file( tqt.h.cmake tqt.h @ONLY )
+
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/tqt.h ${IFACE}/tglobaldefines.h ${IFACE}/accel.h ${IFACE}/accessible.h
-    ${IFACE}/action.h ${IFACE}/application.h ${IFACE}/asyncio.h ${IFACE}/buttongroup.h ${IFACE}/button.h ${IFACE}/canvas.h
-    ${IFACE}/cdestyle.h ${IFACE}/checkbox.h ${IFACE}/clipboard.h ${IFACE}/colordialog.h ${IFACE}/combobox.h
-    ${IFACE}/commonstyle.h ${IFACE}/databrowser.h ${IFACE}/datatable.h ${IFACE}/dataview.h ${IFACE}/datetimeedit.h
-    ${IFACE}/desktopwidget.h ${IFACE}/dial.h ${IFACE}/dialog.h ${IFACE}/dns.h ${IFACE}/dockarea.h ${IFACE}/dockwindow.h
-    ${IFACE}/dragobject.h ${IFACE}/errormessage.h ${IFACE}/eventloop.h ${IFACE}/filedialog.h ${IFACE}/fontdialog.h
-    ${IFACE}/frame.h ${IFACE}/ftp.h ${IFACE}/gl.h ${IFACE}/gplugin.h ${IFACE}/grid.h ${IFACE}/gridview.h ${IFACE}/groupbox.h
-    ${IFACE}/guardedptr.h ${IFACE}/hbox.h ${IFACE}/hbuttongroup.h ${IFACE}/header.h ${IFACE}/hgroupbox.h
-    ${IFACE}/http.h ${IFACE}/iconview.h ${IFACE}/imageformatplugin.h ${IFACE}/inputdialog.h ${IFACE}/label.h
-    ${IFACE}/layout.h ${IFACE}/lcdnumber.h ${IFACE}/lineedit.h ${IFACE}/listbox.h ${IFACE}/listview.h ${IFACE}/localfs.h
-    ${IFACE}/mainwindow.h ${IFACE}/menubar.h ${IFACE}/messagebox.h ${IFACE}/motifplusstyle.h ${IFACE}/motifstyle.h
-    ${IFACE}/multilineedit.h ${IFACE}/networkprotocol.h ${IFACE}/np.h ${IFACE}/objectcleanuphandler.h
-    ${IFACE}/object.h ${IFACE}/platinumstyle.h ${IFACE}/popupmenu.h ${IFACE}/printdialog.h ${IFACE}/process.h
-    ${IFACE}/progressbar.h ${IFACE}/progressdialog.h ${IFACE}/pushbutton.h ${IFACE}/radiobutton.h
-    ${IFACE}/rangecontrol.h ${IFACE}/scrollbar.h ${IFACE}/scrollview.h ${IFACE}/semimodal.h ${IFACE}/serversocket.h
-    ${IFACE}/sessionmanager.h ${IFACE}/sgistyle.h ${IFACE}/signal.h ${IFACE}/signalmapper.h ${IFACE}/sizegrip.h
-    ${IFACE}/slider.h ${IFACE}/socket.h ${IFACE}/socketnotifier.h ${IFACE}/sound.h ${IFACE}/spinbox.h ${IFACE}/splashscreen.h
-    ${IFACE}/splitter.h ${IFACE}/sqldatabase.h ${IFACE}/sqldriver.h ${IFACE}/sqldriverplugin.h ${IFACE}/sqlform.h
-    ${IFACE}/sqlquery.h ${IFACE}/statusbar.h ${IFACE}/style.h ${IFACE}/styleplugin.h ${IFACE}/stylesheet.h ${IFACE}/tabbar.h
-    ${IFACE}/tabdialog.h ${IFACE}/table.h ${IFACE}/tabwidget.h ${IFACE}/textbrowser.h ${IFACE}/textcodecplugin.h
-    ${IFACE}/textedit.h ${IFACE}/textview.h ${IFACE}/timer.h ${IFACE}/toolbar.h ${IFACE}/toolbox.h ${IFACE}/toolbutton.h
-    ${IFACE}/tooltip.h ${IFACE}/translator.h ${IFACE}/urloperator.h ${IFACE}/validator.h ${IFACE}/vbox.h
-    ${IFACE}/vbuttongroup.h ${IFACE}/vgroupbox.h ${IFACE}/widget.h ${IFACE}/widgetplugin.h ${IFACE}/widgetstack.h
-    ${IFACE}/windowsstyle.h ${IFACE}/wizard.h ${IFACE}/workspace.h ${IFACE}/app.h ${IFACE}/array.h ${IFACE}/assistantclient.h
-    ${IFACE}/bitarry.h ${IFACE}/bttngrp.h ${IFACE}/chkbox.h ${IFACE}/clipbrd.h ${IFACE}/collect.h ${IFACE}/collection.h ${IFACE}/combo.h
-    ${IFACE}/config.h ${IFACE}/connect.h ${IFACE}/datetm.h ${IFACE}/drawutl.h ${IFACE}/dstream.h ${IFACE}/features.h
-    ${IFACE}/filedef.h ${IFACE}/filedlg.h ${IFACE}/fileinf.h ${IFACE}/fontinf.h ${IFACE}/fontmet.h ${IFACE}/gbkcodec.h
-    ${IFACE}/generic.h ${IFACE}/gif.h ${IFACE}/global.h ${IFACE}/grpbox.h ${IFACE}/intcach.h ${IFACE}/iodev.h ${IFACE}/jpegio.h
-    ${IFACE}/keycode.h ${IFACE}/lined.h ${IFACE}/list.h ${IFACE}/menudta.h ${IFACE}/metaobj.h ${IFACE}/mlined.h ${IFACE}/mngio.h
-    ${IFACE}/modules.h ${IFACE}/msgbox.h ${IFACE}/multilinedit.h ${IFACE}/network.h ${IFACE}/objcoll.h ${IFACE}/objdefs.h
-    ${IFACE}/paintdc.h ${IFACE}/paintd.h ${IFACE}/pdevmet.h ${IFACE}/pmcache.h ${IFACE}/pntarry.h ${IFACE}/popmenu.h
-    ${IFACE}/prndlg.h ${IFACE}/progbar.h ${IFACE}/progdlg.h ${IFACE}/pushbt.h ${IFACE}/queue.h ${IFACE}/radiobt.h ${IFACE}/rangect.h
-    ${IFACE}/scrbar.h ${IFACE}/session.h ${IFACE}/socknot.h ${IFACE}/stack.h ${IFACE}/tabdlg.h ${IFACE}/tstream.h ${IFACE}/vector.h
-    ${IFACE}/widcoll.h ${IFACE}/windefs.h ${IFACE}/windowdefs.h ${IFACE}/winexport.h ${IFACE}/1xcompatibility.h
-    ${IFACE}/abstractlayout.h ${IFACE}/asciicache.h ${IFACE}/asciidict.h ${IFACE}/asyncimageio.h ${IFACE}/big5codec.h
-    ${IFACE}/bitarray.h ${IFACE}/bitmap.h ${IFACE}/brush.h ${IFACE}/buffer.h ${IFACE}/cache.h ${IFACE}/cleanuphandler.h
-    ${IFACE}/color.h ${IFACE}/compactstyle.h ${IFACE}/connection.h ${IFACE}/cstring.h ${IFACE}/cursor.h ${IFACE}/datastream.h
-    ${IFACE}/datetime.h ${IFACE}/deepcopy.h ${IFACE}/dict.h ${IFACE}/dir.h ${IFACE}/dom.h ${IFACE}/drawutil.h ${IFACE}/dropsite.h
-    ${IFACE}/editorfactory.h ${IFACE}/eucjpcodec.h ${IFACE}/euckrcodec.h ${IFACE}/event.h ${IFACE}/file.h ${IFACE}/fileinfo.h
-    ${IFACE}/focusdata.h ${IFACE}/fontdatabase.h ${IFACE}/font.h ${IFACE}/fontinfo.h ${IFACE}/fontmetrics.h
-    ${IFACE}/garray.h ${IFACE}/gb18030codec.h ${IFACE}/gcache.h ${IFACE}/gdict.h ${IFACE}/glcolormap.h ${IFACE}/glist.h
-    ${IFACE}/gvector.h ${IFACE}/hostaddress.h ${IFACE}/iconset.h ${IFACE}/image.h ${IFACE}/intcache.h ${IFACE}/intdict.h
-    ${IFACE}/interlacestyle.h ${IFACE}/iodevice.h ${IFACE}/jiscodec.h ${IFACE}/jpunicode.h ${IFACE}/keysequence.h
-    ${IFACE}/library.h ${IFACE}/locale.h ${IFACE}/map.h ${IFACE}/memarray.h ${IFACE}/menudata.h ${IFACE}/metaobject.h
-    ${IFACE}/mime.h ${IFACE}/movie.h ${IFACE}/mutex.h ${IFACE}/namespace.h ${IFACE}/objectdict.h ${IFACE}/objectlist.h
-    ${IFACE}/paintdevice.h ${IFACE}/paintdevicemetrics.h ${IFACE}/painter.h ${IFACE}/pair.h ${IFACE}/palette.h ${IFACE}/pen.h
-    ${IFACE}/picture.h ${IFACE}/pixmapcache.h ${IFACE}/pixmap.h ${IFACE}/pngio.h ${IFACE}/pointarray.h ${IFACE}/point.h
-    ${IFACE}/polygonscanner.h ${IFACE}/printer.h ${IFACE}/ptrcollection.h ${IFACE}/ptrdict.h ${IFACE}/ptrlist.h
-    ${IFACE}/ptrqueue.h ${IFACE}/ptrstack.h ${IFACE}/ptrvector.h ${IFACE}/rect.h ${IFACE}/regexp.h ${IFACE}/region.h
-    ${IFACE}/rtlcodec.h ${IFACE}/semaphore.h ${IFACE}/settings.h ${IFACE}/shared.h ${IFACE}/signalslotimp.h
-    ${IFACE}/simplerichtext.h ${IFACE}/size.h ${IFACE}/sizepolicy.h ${IFACE}/sjiscodec.h ${IFACE}/socketdevice.h
-    ${IFACE}/sortedlist.h ${IFACE}/sqlcursor.h ${IFACE}/sqleditorfactory.h ${IFACE}/sqlerror.h ${IFACE}/sqlfield.h
-    ${IFACE}/sql.h ${IFACE}/sqlindex.h ${IFACE}/sqlpropertymap.h ${IFACE}/sqlrecord.h ${IFACE}/sqlresult.h
-    ${IFACE}/sqlselectcursor.h ${IFACE}/string.h ${IFACE}/stringlist.h ${IFACE}/strlist.h ${IFACE}/strvec.h
-    ${IFACE}/stylefactory.h ${IFACE}/syntaxhighlighter.h ${IFACE}/textcodecfactory.h ${IFACE}/textcodec.h
-    ${IFACE}/textstream.h ${IFACE}/thread.h ${IFACE}/threadstorage.h ${IFACE}/tl.h ${IFACE}/tsciicodec.h ${IFACE}/url.h
-    ${IFACE}/urlinfo.h ${IFACE}/utfcodec.h ${IFACE}/uuid.h ${IFACE}/valuelist.h ${IFACE}/valuestack.h ${IFACE}/valuevector.h
-    ${IFACE}/variant.h ${IFACE}/vfbhdr.h ${IFACE}/waitcondition.h ${IFACE}/whatsthis.h ${IFACE}/widgetfactory.h
-    ${IFACE}/widgetintdict.h ${IFACE}/widgetlist.h ${IFACE}/wmatrix.h ${IFACE}/xml.h ${IFACE}/private/tqucomextra_p.h
+    ${CMAKE_CURRENT_BINARY_DIR}/tqt.h ${IFACE}/tqtglobaldefines.h ${IFACE}/tqaccel.h ${IFACE}/tqaccessible.h
+    ${IFACE}/tqaction.h ${IFACE}/tqapplication.h ${IFACE}/tqasyncio.h ${IFACE}/tqbuttongroup.h ${IFACE}/tqbutton.h ${IFACE}/tqcanvas.h
+    ${IFACE}/tqcdestyle.h ${IFACE}/tqcheckbox.h ${IFACE}/tqclipboard.h ${IFACE}/tqcolordialog.h ${IFACE}/tqcombobox.h
+    ${IFACE}/tqcommonstyle.h ${IFACE}/tqdatabrowser.h ${IFACE}/tqdatatable.h ${IFACE}/tqdataview.h ${IFACE}/tqdatetimeedit.h
+    ${IFACE}/tqdesktopwidget.h ${IFACE}/tqdial.h ${IFACE}/tqdialog.h ${IFACE}/tqdns.h ${IFACE}/tqdockarea.h ${IFACE}/tqdockwindow.h
+    ${IFACE}/tqdragobject.h ${IFACE}/tqerrormessage.h ${IFACE}/tqeventloop.h ${IFACE}/tqfiledialog.h ${IFACE}/tqfontdialog.h
+    ${IFACE}/tqframe.h ${IFACE}/tqftp.h ${IFACE}/tqgl.h ${IFACE}/tqgplugin.h ${IFACE}/tqgrid.h ${IFACE}/tqgridview.h ${IFACE}/tqgroupbox.h
+    ${IFACE}/tqguardedptr.h ${IFACE}/tqhbox.h ${IFACE}/tqhbuttongroup.h ${IFACE}/tqheader.h ${IFACE}/tqhgroupbox.h
+    ${IFACE}/tqhttp.h ${IFACE}/tqiconview.h ${IFACE}/tqimageformatplugin.h ${IFACE}/tqinputdialog.h ${IFACE}/tqlabel.h
+    ${IFACE}/tqlayout.h ${IFACE}/tqlcdnumber.h ${IFACE}/tqlineedit.h ${IFACE}/tqlistbox.h ${IFACE}/tqlistview.h ${IFACE}/tqlocalfs.h
+    ${IFACE}/tqmainwindow.h ${IFACE}/tqmenubar.h ${IFACE}/tqmessagebox.h ${IFACE}/tqmotifplusstyle.h ${IFACE}/tqmotifstyle.h
+    ${IFACE}/tqmultilineedit.h ${IFACE}/tqnetworkprotocol.h ${IFACE}/tqnp.h ${IFACE}/tqobjectcleanuphandler.h
+    ${IFACE}/tqobject.h ${IFACE}/tqplatinumstyle.h ${IFACE}/tqpopupmenu.h ${IFACE}/tqprintdialog.h ${IFACE}/tqprocess.h
+    ${IFACE}/tqprogressbar.h ${IFACE}/tqprogressdialog.h ${IFACE}/tqpushbutton.h ${IFACE}/tqradiobutton.h
+    ${IFACE}/tqrangecontrol.h ${IFACE}/tqscrollbar.h ${IFACE}/tqscrollview.h ${IFACE}/tqsemimodal.h ${IFACE}/tqserversocket.h
+    ${IFACE}/tqsessionmanager.h ${IFACE}/tqsgistyle.h ${IFACE}/tqsignal.h ${IFACE}/tqsignalmapper.h ${IFACE}/tqsizegrip.h
+    ${IFACE}/tqslider.h ${IFACE}/tqsocket.h ${IFACE}/tqsocketnotifier.h ${IFACE}/tqsound.h ${IFACE}/tqspinbox.h ${IFACE}/tqsplashscreen.h
+    ${IFACE}/tqsplitter.h ${IFACE}/tqsqldatabase.h ${IFACE}/tqsqldriver.h ${IFACE}/tqsqldriverplugin.h ${IFACE}/tqsqlform.h
+    ${IFACE}/tqsqlquery.h ${IFACE}/tqstatusbar.h ${IFACE}/tqstyle.h ${IFACE}/tqstyleplugin.h ${IFACE}/tqstylesheet.h ${IFACE}/tqtabbar.h
+    ${IFACE}/tqtabdialog.h ${IFACE}/tqtable.h ${IFACE}/tqtabwidget.h ${IFACE}/tqtextbrowser.h ${IFACE}/tqtextcodecplugin.h
+    ${IFACE}/tqtextedit.h ${IFACE}/tqtextview.h ${IFACE}/tqtimer.h ${IFACE}/tqtoolbar.h ${IFACE}/tqtoolbox.h ${IFACE}/tqtoolbutton.h
+    ${IFACE}/tqtooltip.h ${IFACE}/tqtranslator.h ${IFACE}/tqurloperator.h ${IFACE}/tqvalidator.h ${IFACE}/tqvbox.h
+    ${IFACE}/tqvbuttongroup.h ${IFACE}/tqvgroupbox.h ${IFACE}/tqwidget.h ${IFACE}/tqwidgetplugin.h ${IFACE}/tqwidgetstack.h
+    ${IFACE}/tqwindowsstyle.h ${IFACE}/tqwizard.h ${IFACE}/tqworkspace.h ${IFACE}/tqapp.h ${IFACE}/tqarray.h ${IFACE}/tqassistantclient.h
+    ${IFACE}/tqbitarry.h ${IFACE}/tqbttngrp.h ${IFACE}/tqchkbox.h ${IFACE}/tqclipbrd.h ${IFACE}/tqcollect.h ${IFACE}/tqcollection.h ${IFACE}/tqcombo.h
+    ${IFACE}/tqconfig.h ${IFACE}/tqconnect.h ${IFACE}/tqdatetm.h ${IFACE}/tqdrawutl.h ${IFACE}/tqdstream.h ${IFACE}/tqfeatures.h
+    ${IFACE}/tqfiledef.h ${IFACE}/tqfiledlg.h ${IFACE}/tqfileinf.h ${IFACE}/tqfontinf.h ${IFACE}/tqfontmet.h ${IFACE}/tqgbkcodec.h
+    ${IFACE}/tqgeneric.h ${IFACE}/tqgif.h ${IFACE}/tqglobal.h ${IFACE}/tqgrpbox.h ${IFACE}/tqintcach.h ${IFACE}/tqiodev.h ${IFACE}/tqjpegio.h
+    ${IFACE}/tqkeycode.h ${IFACE}/tqlined.h ${IFACE}/tqlist.h ${IFACE}/tqmenudta.h ${IFACE}/tqmetaobj.h ${IFACE}/tqmlined.h ${IFACE}/tqmngio.h
+    ${IFACE}/tqmodules.h ${IFACE}/tqmsgbox.h ${IFACE}/tqmultilinedit.h ${IFACE}/tqnetwork.h ${IFACE}/tqobjcoll.h ${IFACE}/tqobjdefs.h
+    ${IFACE}/tqpaintdc.h ${IFACE}/tqpaintd.h ${IFACE}/tqpdevmet.h ${IFACE}/tqpmcache.h ${IFACE}/tqpntarry.h ${IFACE}/tqpopmenu.h
+    ${IFACE}/tqprndlg.h ${IFACE}/tqprogbar.h ${IFACE}/tqprogdlg.h ${IFACE}/tqpushbt.h ${IFACE}/tqqueue.h ${IFACE}/tqradiobt.h ${IFACE}/tqrangect.h
+    ${IFACE}/tqscrbar.h ${IFACE}/tqsession.h ${IFACE}/tqsocknot.h ${IFACE}/tqstack.h ${IFACE}/tqtabdlg.h ${IFACE}/tqtstream.h ${IFACE}/tqvector.h
+    ${IFACE}/tqwidcoll.h ${IFACE}/tqwindefs.h ${IFACE}/tqwindowdefs.h ${IFACE}/tqwinexport.h ${IFACE}/tq1xcompatibility.h
+    ${IFACE}/tqabstractlayout.h ${IFACE}/tqasciicache.h ${IFACE}/tqasciidict.h ${IFACE}/tqasyncimageio.h ${IFACE}/tqbig5codec.h
+    ${IFACE}/tqbitarray.h ${IFACE}/tqbitmap.h ${IFACE}/tqbrush.h ${IFACE}/tqbuffer.h ${IFACE}/tqcache.h ${IFACE}/tqcleanuphandler.h
+    ${IFACE}/tqcolor.h ${IFACE}/tqcompactstyle.h ${IFACE}/tqconnection.h ${IFACE}/tqcstring.h ${IFACE}/tqcursor.h ${IFACE}/tqdatastream.h
+    ${IFACE}/tqdatetime.h ${IFACE}/tqdeepcopy.h ${IFACE}/tqdict.h ${IFACE}/tqdir.h ${IFACE}/tqdom.h ${IFACE}/tqdrawutil.h ${IFACE}/tqdropsite.h
+    ${IFACE}/tqeditorfactory.h ${IFACE}/tqeucjpcodec.h ${IFACE}/tqeuckrcodec.h ${IFACE}/tqevent.h ${IFACE}/tqfile.h ${IFACE}/tqfileinfo.h
+    ${IFACE}/tqfocusdata.h ${IFACE}/tqfontdatabase.h ${IFACE}/tqfont.h ${IFACE}/tqfontinfo.h ${IFACE}/tqfontmetrics.h
+    ${IFACE}/tqgarray.h ${IFACE}/tqgb18030codec.h ${IFACE}/tqgcache.h ${IFACE}/tqgdict.h ${IFACE}/tqglcolormap.h ${IFACE}/tqglist.h
+    ${IFACE}/tqgvector.h ${IFACE}/tqhostaddress.h ${IFACE}/tqiconset.h ${IFACE}/tqimage.h ${IFACE}/tqintcache.h ${IFACE}/tqintdict.h
+    ${IFACE}/tqinterlacestyle.h ${IFACE}/tqiodevice.h ${IFACE}/tqjiscodec.h ${IFACE}/tqjpunicode.h ${IFACE}/tqkeysequence.h
+    ${IFACE}/tqlibrary.h ${IFACE}/tqlocale.h ${IFACE}/tqmap.h ${IFACE}/tqmemarray.h ${IFACE}/tqmenudata.h ${IFACE}/tqmetaobject.h
+    ${IFACE}/tqmime.h ${IFACE}/tqmovie.h ${IFACE}/tqmutex.h ${IFACE}/tqnamespace.h ${IFACE}/tqobjectdict.h ${IFACE}/tqobjectlist.h
+    ${IFACE}/tqpaintdevice.h ${IFACE}/tqpaintdevicemetrics.h ${IFACE}/tqpainter.h ${IFACE}/tqpair.h ${IFACE}/tqpalette.h ${IFACE}/tqpen.h
+    ${IFACE}/tqpicture.h ${IFACE}/tqpixmapcache.h ${IFACE}/tqpixmap.h ${IFACE}/tqpngio.h ${IFACE}/tqpointarray.h ${IFACE}/tqpoint.h
+    ${IFACE}/tqpolygonscanner.h ${IFACE}/tqprinter.h ${IFACE}/tqptrcollection.h ${IFACE}/tqptrdict.h ${IFACE}/tqptrlist.h
+    ${IFACE}/tqptrqueue.h ${IFACE}/tqptrstack.h ${IFACE}/tqptrvector.h ${IFACE}/tqrect.h ${IFACE}/tqregexp.h ${IFACE}/tqregion.h
+    ${IFACE}/tqrtlcodec.h ${IFACE}/tqsemaphore.h ${IFACE}/tqsettings.h ${IFACE}/tqshared.h ${IFACE}/tqsignalslotimp.h
+    ${IFACE}/tqsimplerichtext.h ${IFACE}/tqsize.h ${IFACE}/tqsizepolicy.h ${IFACE}/tqsjiscodec.h ${IFACE}/tqsocketdevice.h
+    ${IFACE}/tqsortedlist.h ${IFACE}/tqsqlcursor.h ${IFACE}/tqsqleditorfactory.h ${IFACE}/tqsqlerror.h ${IFACE}/tqsqlfield.h
+    ${IFACE}/tqsql.h ${IFACE}/tqsqlindex.h ${IFACE}/tqsqlpropertymap.h ${IFACE}/tqsqlrecord.h ${IFACE}/tqsqlresult.h
+    ${IFACE}/tqsqlselectcursor.h ${IFACE}/tqstring.h ${IFACE}/tqstringlist.h ${IFACE}/tqstrlist.h ${IFACE}/tqstrvec.h
+    ${IFACE}/tqstylefactory.h ${IFACE}/tqsyntaxhighlighter.h ${IFACE}/tqtextcodecfactory.h ${IFACE}/tqtextcodec.h
+    ${IFACE}/tqtextstream.h ${IFACE}/tqthread.h ${IFACE}/tqthreadstorage.h ${IFACE}/tqtl.h ${IFACE}/tqtsciicodec.h ${IFACE}/tqurl.h
+    ${IFACE}/tqurlinfo.h ${IFACE}/tqutfcodec.h ${IFACE}/tquuid.h ${IFACE}/tqvaluelist.h ${IFACE}/tqvaluestack.h ${IFACE}/tqvaluevector.h
+    ${IFACE}/tqvariant.h ${IFACE}/tqvfbhdr.h ${IFACE}/tqwaitcondition.h ${IFACE}/tqwhatsthis.h ${IFACE}/tqwidgetfactory.h
+    ${IFACE}/tqwidgetintdict.h ${IFACE}/tqwidgetlist.h ${IFACE}/tqwmatrix.h ${IFACE}/tqxml.h ${IFACE}/private/tqucomextra_p.h
     ${IFACE}/private/tqlayoutengine_p.h ${IFACE}/private/tqinternal_p.h ${IFACE}/private/tqeffects_p.h
     ${IFACE}/private/tqrichtext_p.h ${IFACE}/private/tqpluginmanager_p.h ${IFACE}/private/tqcom_p.h
     ${IFACE}/private/tqucom_p.h ${IFACE}/private/tqwidgetinterface_p.h ${IFACE}/private/tqtextengine_p.h
-    ${IFACE}/listiterator.h
+    ${IFACE}/tqlistiterator.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 install(
@@ -142,66 +144,66 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tqt.pc DESTINATION ${PKGCONFIG_INSTAL
 ##### tqt (shared) ##############################
 
 
-tde_add_library( ${IFACE}/t SHARED
+tde_add_library( ${IFACE}/tqt SHARED
   SOURCES
-    ${IFACE}/t.cpp ${IFACE}/accel.cpp ${IFACE}/accessible.cpp ${IFACE}/action.cpp ${IFACE}/application.cpp
-    ${IFACE}/asyncio.cpp ${IFACE}/buttongroup.cpp ${IFACE}/button.cpp ${IFACE}/canvas.cpp ${IFACE}/cdestyle.cpp
-    ${IFACE}/checkbox.cpp ${IFACE}/clipboard.cpp ${IFACE}/colordialog.cpp ${IFACE}/combobox.cpp
-    ${IFACE}/commonstyle.cpp ${IFACE}/databrowser.cpp ${IFACE}/datatable.cpp ${IFACE}/dataview.cpp
-    ${IFACE}/datetimeedit.cpp ${IFACE}/desktopwidget.cpp ${IFACE}/dial.cpp ${IFACE}/dialog.cpp ${IFACE}/dns.cpp
-    ${IFACE}/dockarea.cpp ${IFACE}/dockwindow.cpp ${IFACE}/dragobject.cpp ${IFACE}/errormessage.cpp
-    ${IFACE}/eventloop.cpp ${IFACE}/frame.cpp ${IFACE}/ftp.cpp ${IFACE}/filedialog.cpp ${IFACE}/fontdialog.cpp
-    ${IFACE}/gl.cpp ${IFACE}/gplugin.cpp ${IFACE}/grid.cpp ${IFACE}/gridview.cpp ${IFACE}/groupbox.cpp
-    ${IFACE}/guardedptr.cpp ${IFACE}/hbox.cpp ${IFACE}/hbuttongroup.cpp ${IFACE}/header.cpp
-    ${IFACE}/hgroupbox.cpp ${IFACE}/http.cpp ${IFACE}/iconview.cpp ${IFACE}/imageformatplugin.cpp
-    ${IFACE}/inputdialog.cpp ${IFACE}/label.cpp ${IFACE}/layout.cpp ${IFACE}/lcdnumber.cpp ${IFACE}/lineedit.cpp
-    ${IFACE}/listbox.cpp ${IFACE}/listview.cpp ${IFACE}/localfs.cpp ${IFACE}/mainwindow.cpp ${IFACE}/menubar.cpp
-    ${IFACE}/messagebox.cpp ${IFACE}/motifplusstyle.cpp ${IFACE}/motifstyle.cpp ${IFACE}/multilineedit.cpp
-    ${IFACE}/networkprotocol.cpp ${IFACE}/np.cpp ${IFACE}/objectcleanuphandler.cpp ${IFACE}/object.cpp
-    ${IFACE}/platinumstyle.cpp ${IFACE}/popupmenu.cpp ${IFACE}/printdialog.cpp ${IFACE}/process.cpp
-    ${IFACE}/progressbar.cpp ${IFACE}/progressdialog.cpp ${IFACE}/pushbutton.cpp ${IFACE}/radiobutton.cpp
-    ${IFACE}/rangecontrol.cpp ${IFACE}/scrollbar.cpp ${IFACE}/scrollview.cpp ${IFACE}/semimodal.cpp
-    ${IFACE}/serversocket.cpp ${IFACE}/sessionmanager.cpp ${IFACE}/sgistyle.cpp ${IFACE}/signal.cpp
-    ${IFACE}/signalmapper.cpp ${IFACE}/sizegrip.cpp ${IFACE}/slider.cpp ${IFACE}/socket.cpp
-    ${IFACE}/socketnotifier.cpp ${IFACE}/sound.cpp ${IFACE}/spinbox.cpp ${IFACE}/splashscreen.cpp
-    ${IFACE}/splitter.cpp ${IFACE}/sqldatabase.cpp ${IFACE}/sqldriver.cpp ${IFACE}/sqldriverplugin.cpp
-    ${IFACE}/sqlform.cpp ${IFACE}/sqlquery.cpp ${IFACE}/statusbar.cpp ${IFACE}/style.cpp ${IFACE}/styleplugin.cpp
-    ${IFACE}/stylesheet.cpp ${IFACE}/tabbar.cpp ${IFACE}/tabdialog.cpp ${IFACE}/table.cpp ${IFACE}/tabwidget.cpp
-    ${IFACE}/textbrowser.cpp ${IFACE}/textcodecplugin.cpp ${IFACE}/textedit.cpp ${IFACE}/textview.cpp
-    ${IFACE}/timer.cpp ${IFACE}/toolbar.cpp ${IFACE}/toolbox.cpp ${IFACE}/toolbutton.cpp ${IFACE}/tooltip.cpp
-    ${IFACE}/translator.cpp ${IFACE}/urloperator.cpp ${IFACE}/validator.cpp ${IFACE}/vbox.cpp
-    ${IFACE}/vbuttongroup.cpp ${IFACE}/vgroupbox.cpp ${IFACE}/widget.cpp ${IFACE}/widgetplugin.cpp
-    ${IFACE}/widgetstack.cpp ${IFACE}/windowsstyle.cpp ${IFACE}/wizard.cpp ${IFACE}/workspace.cpp
-    ${IFACE}/1xcompatibility.cpp ${IFACE}/abstractlayout.cpp ${IFACE}/asciicache.cpp ${IFACE}/asciidict.cpp
-    ${IFACE}/asyncimageio.cpp ${IFACE}/big5codec.cpp ${IFACE}/bitarray.cpp ${IFACE}/bitmap.cpp ${IFACE}/brush.cpp
-    ${IFACE}/buffer.cpp ${IFACE}/cache.cpp ${IFACE}/cleanuphandler.cpp ${IFACE}/color.cpp ${IFACE}/compactstyle.cpp
-    ${IFACE}/connection.cpp ${IFACE}/cstring.cpp ${IFACE}/cursor.cpp ${IFACE}/datastream.cpp ${IFACE}/datetime.cpp
-    ${IFACE}/deepcopy.cpp ${IFACE}/dict.cpp ${IFACE}/dir.cpp ${IFACE}/dom.cpp ${IFACE}/drawutil.cpp ${IFACE}/dropsite.cpp
-    ${IFACE}/editorfactory.cpp ${IFACE}/eucjpcodec.cpp ${IFACE}/euckrcodec.cpp ${IFACE}/event.cpp ${IFACE}/file.cpp
-    ${IFACE}/fileinfo.cpp ${IFACE}/focusdata.cpp ${IFACE}/fontdatabase.cpp ${IFACE}/font.cpp ${IFACE}/fontinfo.cpp
-    ${IFACE}/fontmetrics.cpp ${IFACE}/garray.cpp ${IFACE}/gb18030codec.cpp ${IFACE}/gcache.cpp ${IFACE}/gdict.cpp
-    ${IFACE}/glcolormap.cpp ${IFACE}/glist.cpp ${IFACE}/gvector.cpp ${IFACE}/hostaddress.cpp ${IFACE}/iconset.cpp
-    ${IFACE}/image.cpp ${IFACE}/intcache.cpp ${IFACE}/intdict.cpp ${IFACE}/interlacestyle.cpp ${IFACE}/iodevice.cpp
-    ${IFACE}/jiscodec.h ${IFACE}/jpunicode.cpp ${IFACE}/keysequence.cpp ${IFACE}/library.cpp ${IFACE}/locale.cpp
-    ${IFACE}/map.cpp ${IFACE}/memarray.cpp ${IFACE}/menudata.cpp ${IFACE}/metaobject.cpp ${IFACE}/mime.cpp ${IFACE}/movie.cpp
-    ${IFACE}/mutex.cpp ${IFACE}/namespace.cpp ${IFACE}/objectdict.cpp ${IFACE}/objectlist.cpp ${IFACE}/paintdevice.cpp
-    ${IFACE}/paintdevicemetrics.cpp ${IFACE}/painter.cpp ${IFACE}/pair.cpp ${IFACE}/palette.cpp ${IFACE}/pen.cpp
-    ${IFACE}/picture.cpp ${IFACE}/pixmapcache.cpp ${IFACE}/pixmap.cpp ${IFACE}/pngio.cpp ${IFACE}/pointarray.cpp
-    ${IFACE}/point.cpp ${IFACE}/polygonscanner.cpp ${IFACE}/printer.cpp ${IFACE}/ptrcollection.cpp
-    ${IFACE}/ptrdict.cpp ${IFACE}/ptrlist.cpp ${IFACE}/ptrqueue.cpp ${IFACE}/ptrstack.cpp ${IFACE}/ptrvector.cpp
-    ${IFACE}/rect.cpp ${IFACE}/regexp.cpp ${IFACE}/region.cpp ${IFACE}/rtlcodec.cpp ${IFACE}/semaphore.cpp
-    ${IFACE}/settings.cpp ${IFACE}/shared.cpp ${IFACE}/signalslotimp.cpp ${IFACE}/simplerichtext.cpp ${IFACE}/size.cpp
-    ${IFACE}/sizepolicy.cpp ${IFACE}/sjiscodec.cpp ${IFACE}/socketdevice.cpp ${IFACE}/sortedlist.cpp
-    ${IFACE}/sqlcursor.cpp ${IFACE}/sqleditorfactory.cpp ${IFACE}/sqlerror.cpp ${IFACE}/sqlfield.cpp
-    ${IFACE}/sql.cpp ${IFACE}/sqlindex.cpp ${IFACE}/sqlpropertymap.cpp ${IFACE}/sqlrecord.cpp ${IFACE}/sqlresult.cpp
-    ${IFACE}/sqlselectcursor.cpp ${IFACE}/string.cpp ${IFACE}/stringlist.cpp ${IFACE}/strlist.cpp ${IFACE}/strvec.cpp
-    ${IFACE}/stylefactory.cpp ${IFACE}/syntaxhighlighter.cpp ${IFACE}/textcodecfactory.cpp
-    ${IFACE}/textcodec.cpp ${IFACE}/textstream.cpp ${IFACE}/thread.cpp ${IFACE}/threadstorage.cpp
-    ${IFACE}/tl.cpp ${IFACE}/tsciicodec.cpp ${IFACE}/url.cpp ${IFACE}/urlinfo.cpp ${IFACE}/utfcodec.cpp ${IFACE}/uuid.cpp
-    ${IFACE}/valuelist.cpp ${IFACE}/valuestack.cpp ${IFACE}/valuevector.cpp ${IFACE}/variant.cpp ${IFACE}/vfbhdr.cpp
-    ${IFACE}/waitcondition.cpp ${IFACE}/whatsthis.cpp ${IFACE}/widgetfactory.cpp ${IFACE}/widgetintdict.cpp
-    ${IFACE}/widgetlist.cpp ${IFACE}/wmatrix.cpp ${IFACE}/xml.cpp ${IFACE}/private/tqucomextra_p.cpp
-    ${IFACE}/listiterator.cpp
+    ${IFACE}/tqt.cpp ${IFACE}/tqaccel.cpp ${IFACE}/tqaccessible.cpp ${IFACE}/tqaction.cpp ${IFACE}/tqapplication.cpp
+    ${IFACE}/tqasyncio.cpp ${IFACE}/tqbuttongroup.cpp ${IFACE}/tqbutton.cpp ${IFACE}/tqcanvas.cpp ${IFACE}/tqcdestyle.cpp
+    ${IFACE}/tqcheckbox.cpp ${IFACE}/tqclipboard.cpp ${IFACE}/tqcolordialog.cpp ${IFACE}/tqcombobox.cpp
+    ${IFACE}/tqcommonstyle.cpp ${IFACE}/tqdatabrowser.cpp ${IFACE}/tqdatatable.cpp ${IFACE}/tqdataview.cpp
+    ${IFACE}/tqdatetimeedit.cpp ${IFACE}/tqdesktopwidget.cpp ${IFACE}/tqdial.cpp ${IFACE}/tqdialog.cpp ${IFACE}/tqdns.cpp
+    ${IFACE}/tqdockarea.cpp ${IFACE}/tqdockwindow.cpp ${IFACE}/tqdragobject.cpp ${IFACE}/tqerrormessage.cpp
+    ${IFACE}/tqeventloop.cpp ${IFACE}/tqframe.cpp ${IFACE}/tqftp.cpp ${IFACE}/tqfiledialog.cpp ${IFACE}/tqfontdialog.cpp
+    ${IFACE}/tqgl.cpp ${IFACE}/tqgplugin.cpp ${IFACE}/tqgrid.cpp ${IFACE}/tqgridview.cpp ${IFACE}/tqgroupbox.cpp
+    ${IFACE}/tqguardedptr.cpp ${IFACE}/tqhbox.cpp ${IFACE}/tqhbuttongroup.cpp ${IFACE}/tqheader.cpp
+    ${IFACE}/tqhgroupbox.cpp ${IFACE}/tqhttp.cpp ${IFACE}/tqiconview.cpp ${IFACE}/tqimageformatplugin.cpp
+    ${IFACE}/tqinputdialog.cpp ${IFACE}/tqlabel.cpp ${IFACE}/tqlayout.cpp ${IFACE}/tqlcdnumber.cpp ${IFACE}/tqlineedit.cpp
+    ${IFACE}/tqlistbox.cpp ${IFACE}/tqlistview.cpp ${IFACE}/tqlocalfs.cpp ${IFACE}/tqmainwindow.cpp ${IFACE}/tqmenubar.cpp
+    ${IFACE}/tqmessagebox.cpp ${IFACE}/tqmotifplusstyle.cpp ${IFACE}/tqmotifstyle.cpp ${IFACE}/tqmultilineedit.cpp
+    ${IFACE}/tqnetworkprotocol.cpp ${IFACE}/tqnp.cpp ${IFACE}/tqobjectcleanuphandler.cpp ${IFACE}/tqobject.cpp
+    ${IFACE}/tqplatinumstyle.cpp ${IFACE}/tqpopupmenu.cpp ${IFACE}/tqprintdialog.cpp ${IFACE}/tqprocess.cpp
+    ${IFACE}/tqprogressbar.cpp ${IFACE}/tqprogressdialog.cpp ${IFACE}/tqpushbutton.cpp ${IFACE}/tqradiobutton.cpp
+    ${IFACE}/tqrangecontrol.cpp ${IFACE}/tqscrollbar.cpp ${IFACE}/tqscrollview.cpp ${IFACE}/tqsemimodal.cpp
+    ${IFACE}/tqserversocket.cpp ${IFACE}/tqsessionmanager.cpp ${IFACE}/tqsgistyle.cpp ${IFACE}/tqsignal.cpp
+    ${IFACE}/tqsignalmapper.cpp ${IFACE}/tqsizegrip.cpp ${IFACE}/tqslider.cpp ${IFACE}/tqsocket.cpp
+    ${IFACE}/tqsocketnotifier.cpp ${IFACE}/tqsound.cpp ${IFACE}/tqspinbox.cpp ${IFACE}/tqsplashscreen.cpp
+    ${IFACE}/tqsplitter.cpp ${IFACE}/tqsqldatabase.cpp ${IFACE}/tqsqldriver.cpp ${IFACE}/tqsqldriverplugin.cpp
+    ${IFACE}/tqsqlform.cpp ${IFACE}/tqsqlquery.cpp ${IFACE}/tqstatusbar.cpp ${IFACE}/tqstyle.cpp ${IFACE}/tqstyleplugin.cpp
+    ${IFACE}/tqstylesheet.cpp ${IFACE}/tqtabbar.cpp ${IFACE}/tqtabdialog.cpp ${IFACE}/tqtable.cpp ${IFACE}/tqtabwidget.cpp
+    ${IFACE}/tqtextbrowser.cpp ${IFACE}/tqtextcodecplugin.cpp ${IFACE}/tqtextedit.cpp ${IFACE}/tqtextview.cpp
+    ${IFACE}/tqtimer.cpp ${IFACE}/tqtoolbar.cpp ${IFACE}/tqtoolbox.cpp ${IFACE}/tqtoolbutton.cpp ${IFACE}/tqtooltip.cpp
+    ${IFACE}/tqtranslator.cpp ${IFACE}/tqurloperator.cpp ${IFACE}/tqvalidator.cpp ${IFACE}/tqvbox.cpp
+    ${IFACE}/tqvbuttongroup.cpp ${IFACE}/tqvgroupbox.cpp ${IFACE}/tqwidget.cpp ${IFACE}/tqwidgetplugin.cpp
+    ${IFACE}/tqwidgetstack.cpp ${IFACE}/tqwindowsstyle.cpp ${IFACE}/tqwizard.cpp ${IFACE}/tqworkspace.cpp
+    ${IFACE}/tq1xcompatibility.cpp ${IFACE}/tqabstractlayout.cpp ${IFACE}/tqasciicache.cpp ${IFACE}/tqasciidict.cpp
+    ${IFACE}/tqasyncimageio.cpp ${IFACE}/tqbig5codec.cpp ${IFACE}/tqbitarray.cpp ${IFACE}/tqbitmap.cpp ${IFACE}/tqbrush.cpp
+    ${IFACE}/tqbuffer.cpp ${IFACE}/tqcache.cpp ${IFACE}/tqcleanuphandler.cpp ${IFACE}/tqcolor.cpp ${IFACE}/tqcompactstyle.cpp
+    ${IFACE}/tqconnection.cpp ${IFACE}/tqcstring.cpp ${IFACE}/tqcursor.cpp ${IFACE}/tqdatastream.cpp ${IFACE}/tqdatetime.cpp
+    ${IFACE}/tqdeepcopy.cpp ${IFACE}/tqdict.cpp ${IFACE}/tqdir.cpp ${IFACE}/tqdom.cpp ${IFACE}/tqdrawutil.cpp ${IFACE}/tqdropsite.cpp
+    ${IFACE}/tqeditorfactory.cpp ${IFACE}/tqeucjpcodec.cpp ${IFACE}/tqeuckrcodec.cpp ${IFACE}/tqevent.cpp ${IFACE}/tqfile.cpp
+    ${IFACE}/tqfileinfo.cpp ${IFACE}/tqfocusdata.cpp ${IFACE}/tqfontdatabase.cpp ${IFACE}/tqfont.cpp ${IFACE}/tqfontinfo.cpp
+    ${IFACE}/tqfontmetrics.cpp ${IFACE}/tqgarray.cpp ${IFACE}/tqgb18030codec.cpp ${IFACE}/tqgcache.cpp ${IFACE}/tqgdict.cpp
+    ${IFACE}/tqglcolormap.cpp ${IFACE}/tqglist.cpp ${IFACE}/tqgvector.cpp ${IFACE}/tqhostaddress.cpp ${IFACE}/tqiconset.cpp
+    ${IFACE}/tqimage.cpp ${IFACE}/tqintcache.cpp ${IFACE}/tqintdict.cpp ${IFACE}/tqinterlacestyle.cpp ${IFACE}/tqiodevice.cpp
+    ${IFACE}/tqjiscodec.h ${IFACE}/tqjpunicode.cpp ${IFACE}/tqkeysequence.cpp ${IFACE}/tqlibrary.cpp ${IFACE}/tqlocale.cpp
+    ${IFACE}/tqmap.cpp ${IFACE}/tqmemarray.cpp ${IFACE}/tqmenudata.cpp ${IFACE}/tqmetaobject.cpp ${IFACE}/tqmime.cpp ${IFACE}/tqmovie.cpp
+    ${IFACE}/tqmutex.cpp ${IFACE}/tqnamespace.cpp ${IFACE}/tqobjectdict.cpp ${IFACE}/tqobjectlist.cpp ${IFACE}/tqpaintdevice.cpp
+    ${IFACE}/tqpaintdevicemetrics.cpp ${IFACE}/tqpainter.cpp ${IFACE}/tqpair.cpp ${IFACE}/tqpalette.cpp ${IFACE}/tqpen.cpp
+    ${IFACE}/tqpicture.cpp ${IFACE}/tqpixmapcache.cpp ${IFACE}/tqpixmap.cpp ${IFACE}/tqpngio.cpp ${IFACE}/tqpointarray.cpp
+    ${IFACE}/tqpoint.cpp ${IFACE}/tqpolygonscanner.cpp ${IFACE}/tqprinter.cpp ${IFACE}/tqptrcollection.cpp
+    ${IFACE}/tqptrdict.cpp ${IFACE}/tqptrlist.cpp ${IFACE}/tqptrqueue.cpp ${IFACE}/tqptrstack.cpp ${IFACE}/tqptrvector.cpp
+    ${IFACE}/tqrect.cpp ${IFACE}/tqregexp.cpp ${IFACE}/tqregion.cpp ${IFACE}/tqrtlcodec.cpp ${IFACE}/tqsemaphore.cpp
+    ${IFACE}/tqsettings.cpp ${IFACE}/tqshared.cpp ${IFACE}/tqsignalslotimp.cpp ${IFACE}/tqsimplerichtext.cpp ${IFACE}/tqsize.cpp
+    ${IFACE}/tqsizepolicy.cpp ${IFACE}/tqsjiscodec.cpp ${IFACE}/tqsocketdevice.cpp ${IFACE}/tqsortedlist.cpp
+    ${IFACE}/tqsqlcursor.cpp ${IFACE}/tqsqleditorfactory.cpp ${IFACE}/tqsqlerror.cpp ${IFACE}/tqsqlfield.cpp
+    ${IFACE}/tqsql.cpp ${IFACE}/tqsqlindex.cpp ${IFACE}/tqsqlpropertymap.cpp ${IFACE}/tqsqlrecord.cpp ${IFACE}/tqsqlresult.cpp
+    ${IFACE}/tqsqlselectcursor.cpp ${IFACE}/tqstring.cpp ${IFACE}/tqstringlist.cpp ${IFACE}/tqstrlist.cpp ${IFACE}/tqstrvec.cpp
+    ${IFACE}/tqstylefactory.cpp ${IFACE}/tqsyntaxhighlighter.cpp ${IFACE}/tqtextcodecfactory.cpp
+    ${IFACE}/tqtextcodec.cpp ${IFACE}/tqtextstream.cpp ${IFACE}/tqthread.cpp ${IFACE}/tqthreadstorage.cpp
+    ${IFACE}/tqtl.cpp ${IFACE}/tqtsciicodec.cpp ${IFACE}/tqurl.cpp ${IFACE}/tqurlinfo.cpp ${IFACE}/tqutfcodec.cpp ${IFACE}/tquuid.cpp
+    ${IFACE}/tqvaluelist.cpp ${IFACE}/tqvaluestack.cpp ${IFACE}/tqvaluevector.cpp ${IFACE}/tqvariant.cpp ${IFACE}/tqvfbhdr.cpp
+    ${IFACE}/tqwaitcondition.cpp ${IFACE}/tqwhatsthis.cpp ${IFACE}/tqwidgetfactory.cpp ${IFACE}/tqwidgetintdict.cpp
+    ${IFACE}/tqwidgetlist.cpp ${IFACE}/tqwmatrix.cpp ${IFACE}/tqxml.cpp ${IFACE}/private/tqucomextra_p.cpp
+    ${IFACE}/tqlistiterator.cpp
   VERSION 4.2.0
   LINK ${QT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
@@ -212,7 +214,7 @@ tde_add_library( ${IFACE}/t SHARED
 
 tde_add_library( tqassistantclient SHARED
   SOURCES
-    tqassistantclient.cpp
+    ${IFACE}/tqassistantclient.cpp
   VERSION 4.2.0
   LINK ${QT_LIBRARIES} -lqassistantclient
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake
index f8f813e..bd44cf0 100644
--- a/qtinterface/tqt.h.cmake
+++ b/qtinterface/tqt.h.cmake
@@ -48,7 +48,13 @@ Boston, MA 02110-1301, USA.
 
 #ifdef USE_QT3
 
+#cmakedefine HAVE_REAL_TQT 1
+
+#ifdef HAVE_REAL_TQT
+#include <ntqglobal.h>
+#else /* HAVE_REAL_TQT */
 #include <qglobal.h>
+#endif /* HAVE_REAL_TQT */
 
 #ifdef QT_NO_SQL
 #define TQT_NO_SQL