diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-12 18:31:45 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-12 18:31:45 +0000 |
commit | 52f8a1d18175ad99fbc01d2d9b7b9e822573cac3 (patch) | |
tree | b5ca23487a951381de58cfc28fb3cde9d6052d8d /qtinterface/tqt.h | |
parent | 8385c1bc03d09c43de703fcf50d8f607f3250cfa (diff) | |
download | tqtinterface-52f8a1d18175ad99fbc01d2d9b7b9e822573cac3.tar.gz tqtinterface-52f8a1d18175ad99fbc01d2d9b7b9e822573cac3.zip |
Qt3 compilation fix
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1162810 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'qtinterface/tqt.h')
-rw-r--r-- | qtinterface/tqt.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/qtinterface/tqt.h b/qtinterface/tqt.h index 1a73049..f4c50bf 100644 --- a/qtinterface/tqt.h +++ b/qtinterface/tqt.h @@ -24,6 +24,9 @@ Boston, MA 02110-1301, USA. #define USE_QTX +// DEBUG ONLY REMOVE ME TEST +#define USE_QT4 + #ifdef USE_QT4 #define QT3_SUPPORT #endif @@ -45,6 +48,9 @@ Boston, MA 02110-1301, USA. #endif // __cplusplus #ifdef USE_QT3 +#define qint64 long +#define quint64 unsigned long + #define tqchildren children #define tqaccess access #define tqcolorTable colorTable @@ -599,6 +605,7 @@ class QUObject; #include <tqt4/Qt/qiodevice.h> #undef QT_NO_QOBJECT #include <tqt4/Qt/qdatastream.h> +#include <tqt4/Qt/qvariant.h> #include <tqt4/Qt/qmetaobject.h> #include <tqeventloop.h> #include <tqt4/Qt/qpaintdevice.h> @@ -620,11 +627,14 @@ class QUObject; #include <tqt4/Qt/qmenudata.h> #include <tqt4/Qt/qdir.h> #include <tqt4/Qt/qtooltip.h> +#include <tqt4/Qt/qmovie.h> + #include <Qt/q3strlist.h> #include <Qt/qx11info_x11.h> #include <Qt/q3combobox.h> +#include <Qt/q3groupbox.h> #include <Qt/q3popupmenu.h> #include <Qt/q3progressbar.h> #include <Qt/q3textstream.h> @@ -785,7 +795,8 @@ class QUObject; #define WState Qt::WidgetAttribute #define WState_Polished Qt::WA_WState_Polished -#define WState_ForceHide Qt::WA_WState_ForceHide +//#define WState_ForceHide Qt::WA_WState_ForceHide +#define WState_ForceHide Qt::WA_WState_Hidden #define WStyle_Customize Qt::WStyle_Customize #define WType_Popup Qt::WType_Popup @@ -1078,7 +1089,7 @@ class QUObject; #define TQMacMime QMacMime #define TQMotifPlusStyle QMotifPlusStyle #define TQMotifStyle QMotifStyle -#define TQMovie QMovie +//#define TQMovie QMovie #define TQMultiLineEdit Q3MultiLineEdit #define TQMutex QMutex #define TQMutexLocker QMutexLocker |