Remove qt3support dependency of qtconfig

Revert "Revert the integration of the merge request 2286."
This reverts commit e3edad83a1e6e99a551d40d4118352435c6dd710.

This had been submitted in the Qt 4.7, but reverted because
the change was to intrusive to be pushed in a stable branch.
Now re-apply the change in master.

Conflicts:

	tools/qtconfig/mainwindowbase.cpp
	tools/qtconfig/mainwindowbase.h
	tools/qtconfig/paletteeditoradvancedbase.cpp
	tools/qtconfig/paletteeditoradvancedbase.h
	tools/qtconfig/paletteeditoradvancedbase.ui
	tools/qtconfig/previewwidgetbase.cpp
	tools/qtconfig/previewwidgetbase.h
	tools/qtconfig/previewwidgetbase.ui
	tools/tools.pro

1 files changed, 13 insertions, 5 deletions

diff --git a/tools/qtconfig/previewwidget.h b/tools/qtconfig/previewwidget.h
index a6ec5b3c62..d39fd75404 100644
--- a/tools/qtconfig/previewwidget.h
+++ b/tools/qtconfig/previewwidget.h
@@ -42,21 +42,29 @@
 #ifndef PREVIEWWIDGET_H
 #define PREVIEWWIDGET_H
 
-#include "previewwidgetbase.h"
+#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 
-class PreviewWidget : public PreviewWidgetBase
+namespace Ui {
+  class PreviewWidget;
+}
+
+
+class PreviewWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    PreviewWidget( QWidget *parent = 0, const char *name = 0 );
+    PreviewWidget(QWidget *parent = 0);
+    ~PreviewWidget();
 
-    void closeEvent(QCloseEvent *);
     bool eventFilter(QObject *, QEvent *);
+private:
+    void closeEvent(QCloseEvent *);
+    Ui::PreviewWidget *ui;
 };
 
 QT_END_NAMESPACE
 
-#endif
+#endif // PREVIEWWIDGET_H