diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/app/main.cpp | 10 | ||||
| -rw-r--r-- | tools/designer/uic/embed.cpp | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp index 6d7a90c40..74dadc19c 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/uic/embed.cpp b/tools/designer/uic/embed.cpp index 5a272e33d..aa4597d34 100644 --- a/tools/designer/uic/embed.cpp +++ b/tools/designer/uic/embed.cpp @@ -304,7 +304,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima 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"; |