diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 953f5d89..8a2d9e5d 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -823,9 +823,6 @@ class TQDataStream;
#ifndef TQT_MODULE_DIALOGS
# define QT_NO_DIALOG
#endif
-#ifndef TQT_MODULE_ICONVIEW
-# define QT_NO_ICONVIEW
-#endif
#ifndef TQT_MODULE_WORKSPACE
# define QT_NO_WORKSPACE
#endif
diff --git a/doc/html/qiconview-h.html b/doc/html/qiconview-h.html
index e2718de9..1498e6ea 100644
--- a/doc/html/qiconview-h.html
+++ b/doc/html/qiconview-h.html
@@ -91,12 +91,6 @@ body { background: #ffffff; color: black; }
#ifndef QT_NO_ICONVIEW
-#if !defined( TQT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
-#define TQM_EXPORT_ICONVIEW
-#else
-#define TQM_EXPORT_ICONVIEW Q_EXPORT
-#endif
-
class TQIconView;
class TQPainter;
class TQMimeSource;
@@ -114,7 +108,7 @@ class TQIconDragPrivate;
#ifndef QT_NO_DRAGANDDROP
-class TQM_EXPORT_ICONVIEW TQIconDragItem
+class Q_EXPORT TQIconDragItem
{
public:
TQIconDragItem();
@@ -128,7 +122,7 @@ private:
};
-class TQM_EXPORT_ICONVIEW TQIconDrag : public TQDragObject
+class Q_EXPORT TQIconDrag : public TQDragObject
{
TQ_OBJECT
public:
@@ -158,7 +152,7 @@ private:
class TQIconViewToolTip;
class TQIconViewItemPrivate;
-class TQM_EXPORT_ICONVIEW TQIconViewItem : public TQt
+class Q_EXPORT TQIconViewItem : public TQt
{
friend class TQIconView;
friend class TQIconViewToolTip;
@@ -301,7 +295,7 @@ private:
class TQIconViewPrivate; /* don't touch */
-class TQM_EXPORT_ICONVIEW TQIconView : public TQScrollView
+class Q_EXPORT TQIconView : public TQScrollView
{
friend class TQIconViewItem;
friend class TQIconViewPrivate;
diff --git a/examples/demo/demo.pro b/examples/demo/demo.pro
index 3413fcd0..fa49ef08 100644
--- a/examples/demo/demo.pro
+++ b/examples/demo/demo.pro
@@ -3,7 +3,6 @@ TARGET = demo
CONFIG += qt warn_off release
unix:LIBS += -lm
-DEFINES += QT_INTERNAL_ICONVIEW
DEFINES += QT_INTERNAL_WORKSPACE
DEFINES += QT_INTERNAL_CANVAS
INCLUDEPATH += .
diff --git a/include/ntqiconview.h b/include/ntqiconview.h
index 329c53b6..113ed2d1 120000
--- a/include/ntqiconview.h
+++ b/include/ntqiconview.h
@@ -1 +1 @@
-../src/iconview/ntqiconview.h
\ No newline at end of file
+../src/widgets/ntqiconview.h
\ No newline at end of file
diff --git a/src/iconview/qt_iconview.pri b/src/iconview/qt_iconview.pri
deleted file mode 100644
index df1613b5..00000000
--- a/src/iconview/qt_iconview.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-# Qt iconview module
-
-iconview {
- HEADERS += $$ICONVIEW_H/ntqiconview.h
- SOURCES += $$ICONVIEW_CPP/qiconview.cpp
-}
diff --git a/src/qt.pro b/src/qt.pro
index b2e0d1af..d3536425 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -31,7 +31,6 @@ WIDGETS_CPP = widgets
SQL_CPP = sql
TABLE_CPP = table
DIALOGS_CPP = dialogs
-ICONVIEW_CPP = iconview
NETWORK_CPP = network
OPENGL_CPP = opengl
TOOLS_CPP = tools
@@ -49,7 +48,6 @@ win32 {
WIDGETS_H = $$WIDGETS_CPP
TABLE_H = $$TABLE_CPP
DIALOGS_H = $$DIALOGS_CPP
- ICONVIEW_H = $$ICONVIEW_CPP
NETWORK_H = $$NETWORK_CPP
OPENGL_H = $$OPENGL_CPP
TOOLS_H = $$TOOLS_CPP
@@ -66,7 +64,6 @@ win32 {
WIDGETS_H = $$WIN_ALL_H
TABLE_H = $$WIN_ALL_H
DIALOGS_H = $$WIN_ALL_H
- ICONVIEW_H = $$WIN_ALL_H
NETWORK_H = $$WIN_ALL_H
OPENGL_H = $$WIN_ALL_H
TOOLS_H = $$WIN_ALL_H
@@ -95,7 +92,6 @@ unix {
SQL_H = $$SQL_CPP
TABLE_H = $$TABLE_CPP
DIALOGS_H = $$DIALOGS_CPP
- ICONVIEW_H = $$ICONVIEW_CPP
NETWORK_H = $$NETWORK_CPP
OPENGL_H = $$OPENGL_CPP
TOOLS_H = $$TOOLS_CPP
@@ -117,7 +113,7 @@ embedded {
}
DEPENDPATH += ;$$NETWORK_H;$$KERNEL_H;$$WIDGETS_H;$$INPUTMETHOD_H;$$SQL_H;$$TABLE_H;$$DIALOGS_H;
-DEPENDPATH += $$ICONVIEW_H;$$OPENGL_H;$$TOOLS_H;$$CODECS_H;$$WORKSPACE_H;$$XML_H;
+DEPENDPATH += $$OPENGL_H;$$TOOLS_H;$$CODECS_H;$$WORKSPACE_H;$$XML_H;
DEPENDPATH += $$CANVAS_H;$$STYLES_H
embedded:DEPENDPATH += ;$$EMBEDDED_H
@@ -149,7 +145,6 @@ embedded:include($$KERNEL_CPP/qt_qws.pri)
include($$KERNEL_CPP/qt_kernel.pri)
include($$WIDGETS_CPP/qt_widgets.pri)
include($$DIALOGS_CPP/qt_dialogs.pri)
-include($$ICONVIEW_CPP/qt_iconview.pri)
include($$WORKSPACE_CPP/qt_workspace.pri)
include($$INPUTMETHOD_CPP/qt_inputmethod.pri)
include($$NETWORK_CPP/qt_network.pri)
diff --git a/src/qt_professional.pri b/src/qt_professional.pri
index 6320b9c5..38375d49 100644
--- a/src/qt_professional.pri
+++ b/src/qt_professional.pri
@@ -46,21 +46,6 @@
DEFINES *= TQT_MODULE_WORKSPACE
}
-!iconview:contains( DEFINES, QT_INTERNAL_ICONVIEW ) {
- CONFIG += iconview
- ICONVIEW_CPP = $$QT_SOURCE_TREE/src/iconview
- win32 {
- WIN_ALL_H = $$QT_SOURCE_TREE/include
- ICONVIEW_H = $$WIN_ALL_H
- }
- unix {
- ICONVIEW_H = $$ICONVIEW_CPP
- }
- INCLUDEPATH += $$QT_SOURCE_TREE/src/iconview
- include( $$QT_SOURCE_TREE/src/iconview/qt_iconview.pri )
- DEFINES *= TQT_MODULE_ICONVIEW
-}
-
!canvas:contains( DEFINES, QT_INTERNAL_CANVAS ) {
CONFIG += canvas
CANVAS_CPP = $$QT_SOURCE_TREE/src/canvas
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 7b54c340..db41468f 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -791,12 +791,6 @@ class TQDataStream;
#ifndef TQT_MODULE_DIALOGS
# define QT_NO_DIALOG
#endif
-#ifndef TQT_MODULE_ICONVIEW
-# define QT_NO_ICONVIEW
-#endif
-#ifndef TQT_MODULE_WORKSPACE
-# define QT_NO_WORKSPACE
-#endif
#ifndef TQT_MODULE_NETWORK
#define QT_NO_NETWORK
#endif
diff --git a/src/iconview/ntqiconview.h b/src/widgets/ntqiconview.h
similarity index 97%
rename from src/iconview/ntqiconview.h
rename to src/widgets/ntqiconview.h
index 34085827..f4020519 100644
--- a/src/iconview/ntqiconview.h
+++ b/src/widgets/ntqiconview.h
@@ -55,12 +55,6 @@
#ifndef QT_NO_ICONVIEW
-#if !defined( TQT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
-#define TQM_EXPORT_ICONVIEW
-#else
-#define TQM_EXPORT_ICONVIEW Q_EXPORT
-#endif
-
class TQIconView;
class TQPainter;
class TQMimeSource;
@@ -78,7 +72,7 @@ class TQIconDragPrivate;
#ifndef QT_NO_DRAGANDDROP
-class TQM_EXPORT_ICONVIEW TQIconDragItem
+class Q_EXPORT TQIconDragItem
{
public:
TQIconDragItem();
@@ -92,7 +86,7 @@ private:
};
-class TQM_EXPORT_ICONVIEW TQIconDrag : public TQDragObject
+class Q_EXPORT TQIconDrag : public TQDragObject
{
TQ_OBJECT
public:
@@ -122,7 +116,7 @@ private:
class TQIconViewToolTip;
class TQIconViewItemPrivate;
-class TQM_EXPORT_ICONVIEW TQIconViewItem : public TQt
+class Q_EXPORT TQIconViewItem : public TQt
{
friend class TQIconView;
friend class TQIconViewToolTip;
@@ -269,7 +263,7 @@ private:
class TQIconViewPrivate; /* don't touch */
-class TQM_EXPORT_ICONVIEW TQIconView : public TQScrollView
+class Q_EXPORT TQIconView : public TQScrollView
{
friend class TQIconViewItem;
friend class TQIconViewPrivate;
diff --git a/src/iconview/qiconview.cpp b/src/widgets/qiconview.cpp
similarity index 99%
rename from src/iconview/qiconview.cpp
rename to src/widgets/qiconview.cpp
index f6b2ae13..ac1510b9 100644
--- a/src/iconview/qiconview.cpp
+++ b/src/widgets/qiconview.cpp
@@ -166,7 +166,7 @@ static TQPixmap *get_qiv_buffer_pixmap( const TQSize &s )
#ifndef QT_NO_DRAGANDDROP
-class TQM_EXPORT_ICONVIEW TQIconDragData
+class Q_EXPORT TQIconDragData
{
public:
TQIconDragData();
@@ -184,7 +184,7 @@ public:
bool operator==( const TQIconDragData &i ) const;
};
-class TQM_EXPORT_ICONVIEW TQIconDragDataItem
+class Q_EXPORT TQIconDragDataItem
{
public:
TQIconDragDataItem() {}
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 79d33812..774c9730 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -2351,7 +2351,7 @@ void TQListViewItem::ignoreDoubleClick()
item \a i, similar to the TQWidget::enterEvent() function.
*/
-// ### bug here too? see qiconview.cppp onItem/onViewport
+// ### bug here too? see qiconview.cpp onItem/onViewport
/*!
\fn void TQListView::onViewport()
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 9410e3e4..6da72461 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -20,6 +20,7 @@ widgets {
$$WIDGETS_H/ntqheader.h \
$$WIDGETS_H/ntqhgroupbox.h \
$$WIDGETS_H/ntqhbox.h \
+ $$WIDGETS_H/ntqiconview.h \
$$WIDGETS_H/ntqlabel.h \
$$WIDGETS_H/ntqlcdnumber.h \
$$WIDGETS_H/ntqlineedit.h \
@@ -81,6 +82,7 @@ widgets {
$$WIDGETS_CPP/qheader.cpp \
$$WIDGETS_CPP/qhgroupbox.cpp \
$$WIDGETS_CPP/qhbox.cpp \
+ $$WIDGETS_CPP/qiconview.cpp \
$$WIDGETS_CPP/qlabel.cpp \
$$WIDGETS_CPP/qlcdnumber.cpp \
$$WIDGETS_CPP/qlineedit.cpp \
diff --git a/tools/designer/designer/designer.pro b/tools/designer/designer/designer.pro
index 64a7ece8..325b5dc1 100644
--- a/tools/designer/designer/designer.pro
+++ b/tools/designer/designer/designer.pro
@@ -12,7 +12,6 @@ TARGET = tqtdesignercore
DEFINES += DESIGNER
DEFINES += QT_INTERNAL_XML
DEFINES += QT_INTERNAL_WORKSPACE
-DEFINES += QT_INTERNAL_ICONVIEW
DEFINES += QT_INTERNAL_TABLE
table:win32-msvc:DEFINES+=QM_TEMPLATE_EXTERN_TABLE=extern