9 files changed, 8 insertions, 18 deletions
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index b9c7cb047..e0bb62f1a 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -33,11 +33,6 @@
 
 #include "qplatformdefs.h"
 
-// SCO OpenServer redefines raise -> kill
-#if defined(raise)
-# undef raise
-#endif
-
 #include "mainwindow.h"
 #include "formwindow.h"
 
@@ -52,11 +47,6 @@
 #include <stdlib.h>
 #include <signal.h>
 
-// SCO OpenServer redefines raise -> kill
-#if defined(raise)
-# undef raise
-#endif
-
 #if defined(TQ_WS_WIN)
 #include <qt_windows.h>
 #include <process.h>
diff --git a/tools/designer/examples/opengl/main.cpp b/tools/designer/examples/opengl/main.cpp
index 3882cab86..24f3fbb59 100644
--- a/tools/designer/examples/opengl/main.cpp
+++ b/tools/designer/examples/opengl/main.cpp
@@ -299,7 +299,7 @@ TQRESULT OpenGLWidgetInterface::queryInterface( const TQUuid& uuid, TQUnknownInt
     return TQS_OK;
 }
 
-Q_EXPORT_COMPONENT()
+TQ_EXPORT_COMPONENT()
 {
     Q_CREATE_INSTANCE( OpenGLWidgetInterface );
 }
diff --git a/tools/designer/plugins/cppeditor/common.cpp b/tools/designer/plugins/cppeditor/common.cpp
index 02c80de11..7a8e94d73 100644
--- a/tools/designer/plugins/cppeditor/common.cpp
+++ b/tools/designer/plugins/cppeditor/common.cpp
@@ -105,7 +105,7 @@ TQRESULT CommonInterface::queryInterface( const TQUuid &uuid, TQUnknownInterface
 }
 
 
-Q_EXPORT_COMPONENT()
+TQ_EXPORT_COMPONENT()
 {
      Q_CREATE_INSTANCE( CommonInterface )
 }
diff --git a/tools/designer/plugins/dlg/main.cpp b/tools/designer/plugins/dlg/main.cpp
index 96bb6d914..ab93650b9 100644
--- a/tools/designer/plugins/dlg/main.cpp
+++ b/tools/designer/plugins/dlg/main.cpp
@@ -102,7 +102,7 @@ bool DlgFilter::canUnload() const
     return TRUE;
 }
 
-Q_EXPORT_COMPONENT()
+TQ_EXPORT_COMPONENT()
 {
     Q_CREATE_INSTANCE( DlgFilter )
 }
diff --git a/tools/designer/plugins/glade/main.cpp b/tools/designer/plugins/glade/main.cpp
index 879493c6c..d4a7668b9 100644
--- a/tools/designer/plugins/glade/main.cpp
+++ b/tools/designer/plugins/glade/main.cpp
@@ -103,7 +103,7 @@ bool GladeFilter::canUnload() const
     return TRUE;
 }
 
-Q_EXPORT_COMPONENT()
+TQ_EXPORT_COMPONENT()
 {
     Q_CREATE_INSTANCE( GladeFilter )
 }
diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp
index 767c90b9b..aef5517e0 100644
--- a/tools/designer/plugins/kdevdlg/main.cpp
+++ b/tools/designer/plugins/kdevdlg/main.cpp
@@ -114,7 +114,7 @@ bool KDevDlgFilter::canUnload() const
     return TRUE;
 }
 
-Q_EXPORT_COMPONENT()
+TQ_EXPORT_COMPONENT()
 {
     Q_CREATE_INSTANCE( KDevDlgFilter )
 }
diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp
index 502c6729e..6a821686b 100644
--- a/tools/designer/plugins/rc/main.cpp
+++ b/tools/designer/plugins/rc/main.cpp
@@ -111,7 +111,7 @@ bool RCFilter::canUnload() const
     return TRUE;
 }
 
-Q_EXPORT_COMPONENT()
+TQ_EXPORT_COMPONENT()
 {
     Q_CREATE_INSTANCE( RCFilter )
 }
diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp
index 1a4bb7b53..cca81382a 100644
--- a/tools/designer/plugins/wizards/main.cpp
+++ b/tools/designer/plugins/wizards/main.cpp
@@ -136,7 +136,7 @@ TQRESULT StandardTemplateWizardInterface::queryInterface( const TQUuid& uuid, TQ
     return TQS_OK;
 }
 
-Q_EXPORT_COMPONENT()
+TQ_EXPORT_COMPONENT()
 {
     Q_CREATE_INSTANCE( StandardTemplateWizardInterface )
 }
diff --git a/tools/designer/tquic/embed.cpp b/tools/designer/tquic/embed.cpp
index 422023009..4f8fa48f4 100644
--- a/tools/designer/tquic/embed.cpp
+++ b/tools/designer/tquic/embed.cpp
@@ -297,7 +297,7 @@ void TQUic::embed( TQTextStream& out, const char* project, const TQStringList& i
 	out << "{\n";
 	out << "public:\n";
 	out << "    StaticInitImages_" << cProject << "() { qInitImages_" << cProject << "(); }\n";
-	out << "#if defined(Q_OS_SCO) || defined(Q_OS_UNIXWARE)\n";
+	out << "#if defined(Q_OS_UNIXWARE)\n";
 	out << "    ~StaticInitImages_" << cProject << "() { }\n";
 	out << "#else\n";
 	out << "    ~StaticInitImages_" << cProject << "() { qCleanupImages_" << cProject << "(); }\n";