10 files changed, 10 insertions, 22 deletions
diff --git a/tools/designer/designer/designer.pro b/tools/designer/designer/designer.pro
index da8c8cf29..71beb9bb7 100644
--- a/tools/designer/designer/designer.pro
+++ b/tools/designer/designer/designer.pro
@@ -416,15 +416,7 @@ table {
 }
 
 INCLUDEPATH	+= ../shared ../uilib
-LIBS            += -L$$QT_BUILD_TREE/lib -ltqui
-
-hpux-acc* {
-	LIBS            += $$QT_BUILD_TREE/lib/libtqassistantclient.a
-}
-
-!hpux-acc* {
-	LIBS		+= -ltqassistantclient
-}
+LIBS            += -L$$QT_BUILD_TREE/lib -ltqui -ltqassistantclient
 
 TRANSLATIONS	= designer_de.ts designer_fr.ts
 
diff --git a/tools/designer/designer/orderindicator.cpp b/tools/designer/designer/orderindicator.cpp
index d8c03e7f6..5f28dea05 100644
--- a/tools/designer/designer/orderindicator.cpp
+++ b/tools/designer/designer/orderindicator.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <tqvariant.h> // HP-UX compiler need this here
+#include <tqvariant.h>
 
 #include "orderindicator.h"
 #include "formwindow.h"
diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp
index 0a6c135e6..4cbbef673 100644
--- a/tools/designer/designer/pixmapchooser.cpp
+++ b/tools/designer/designer/pixmapchooser.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
 
 #include "pixmapchooser.h"
 #include "formwindow.h"
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index a392ada92..24e06588e 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <tqvariant.h> // HP-UX compiler needs this here
+#include <tqvariant.h>
 
 #include "propertyeditor.h"
 #include "formwindow.h"
diff --git a/tools/designer/designer/sizehandle.cpp b/tools/designer/designer/sizehandle.cpp
index 4906eda60..c8a1edc3d 100644
--- a/tools/designer/designer/sizehandle.cpp
+++ b/tools/designer/designer/sizehandle.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <tqvariant.h>  // HP-UX compiler needs this here
+#include <tqvariant.h>
 
 #include "sizehandle.h"
 #include "formwindow.h"
diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp
index 9518bbe80..53602cb32 100644
--- a/tools/designer/designer/styledbutton.cpp
+++ b/tools/designer/designer/styledbutton.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <tqvariant.h>  // HP-UX compiler needs this here
+#include <tqvariant.h>
 #include "styledbutton.h"
 #include "formwindow.h"
 #include "pixmapchooser.h"
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 0c8ced55c..92f95e846 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <tqvariant.h> // HP-UX compiler need this here
+#include <tqvariant.h>
 #include "widgetfactory.h"
 #include <widgetdatabase.h>
 #include "metadatabase.h"
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index 330440810..2c3d8b93c 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <tqvariant.h>  // HP-UX compiler needs this here
+#include <tqvariant.h>
 #include "workspace.h"
 #include "formwindow.h"
 #include "mainwindow.h"
diff --git a/tools/designer/plugins/cppeditor/cppeditor.pro b/tools/designer/plugins/cppeditor/cppeditor.pro
index 6cfdf8f15..a67690310 100644
--- a/tools/designer/plugins/cppeditor/cppeditor.pro
+++ b/tools/designer/plugins/cppeditor/cppeditor.pro
@@ -11,11 +11,7 @@ VERSION		= 1.0.0
 
 INCLUDEPATH	+= ../../interfaces ../../editor $$QT_BUILD_TREE/tools/designer/editor
 
-hpux-* {
-	LIBS += $$QT_BUILD_TREE/lib/libtqteditor.a
-} else {
-	LIBS    += -L$$QT_BUILD_TREE/lib -ltqteditor
-}
+LIBS    += -L$$QT_BUILD_TREE/lib -ltqteditor
 
 target.path += $$plugins.path/designer
 INSTALLS 	+= target
diff --git a/tools/designer/tquic/form.cpp b/tools/designer/tquic/form.cpp
index 1ada5a780..b9d8fd703 100644
--- a/tools/designer/tquic/form.cpp
+++ b/tools/designer/tquic/form.cpp
@@ -196,7 +196,7 @@ void TQUic::createFormDecl( const TQDomElement &e )
     out << "#ifndef " << protector << endl;
     out << "#define " << protector << endl;
     out << endl;
-    out << "#include <tqvariant.h>" << endl; // for broken HP-UX compilers
+    out << "#include <tqvariant.h>" << endl;
 
     if ( !imageMembers.isEmpty() )
 	out << "#include <tqpixmap.h>" << endl;