summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-03-30 15:44:38 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-03-30 16:05:15 +0200
commit00318b767abcea93723f5dbcb4c142741904e707 (patch)
tree9a3b673180158e6d19949dd6d3fa8b9ffd126670
parent0f480dc43f6a3dc50b438a17fc2526ca444065ec (diff)
downloadtqt3-00318b767abcea93723f5dbcb4c142741904e707.tar.gz
tqt3-00318b767abcea93723f5dbcb4c142741904e707.zip
IconView widget was moved to Widgets module in commit
a41a034902bb3aa75db4524978a174353b5de2fe, but there remained the iconview module definition as standalone. This causes incorrect BUILD_KEY and library configuration declaration. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rwxr-xr-xconfigure8
-rw-r--r--doc/html/index2
-rw-r--r--doc/html/titleindex2
3 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index 8e25e98d3..92cec2730 100755
--- a/configure
+++ b/configure
@@ -79,7 +79,7 @@ Licensee="Free"
Products="qt-free"
# modules depending on free license
-MODULES="styles tools kernel widgets dialogs iconview workspace inputmethod \
+MODULES="styles tools kernel widgets dialogs workspace inputmethod \
network canvas table xml opengl sql"
CFG_MODULES_AVAILABLE=$MODULES
QMAKE_VARS="$QMAKE_VARS \"QT_PRODUCT=$Products\""
@@ -2860,7 +2860,7 @@ esac
# minimal-config small-config medium-config large-config full-config
#
# Modules:
-# styles tools kernel widgets dialogs iconview workspace inputmethod
+# styles tools kernel widgets dialogs workspace inputmethod
#
# Enterprise/Open Source edition modules:
# network canvas table xml opengl sql
@@ -2894,7 +2894,7 @@ esac
# X11 : xftnameunparse x11sm xinerama xcursor xrandr xrender xftfreetype xkb inputmethod
# Embedded: embedded ft
#
-ALL_OPTIONS="styles tools kernel widgets dialogs iconview workspace inputmethod network canvas table xml opengl sql stl"
+ALL_OPTIONS="styles tools kernel widgets dialogs workspace inputmethod network canvas table xml opengl sql stl"
BUILD_CONFIG=
BUILD_OPTIONS=
@@ -2908,7 +2908,7 @@ for config_option in $QMAKE_CONFIG; do
BUILD_CONFIG="$config_option"
;;
- styles|tools|kernel|widgets|dialogs|iconview|workspace|inputmethod|network|canvas|table|xml|opengl|sql|stl)
+ styles|tools|kernel|widgets|dialogs|workspace|inputmethod|network|canvas|table|xml|opengl|sql|stl)
# these config options affect the TQt API/ABI. they should influence
# the generation of the buildkey, so we don't skip them
SKIP="no"
diff --git a/doc/html/index b/doc/html/index
index de147438a..2286467ad 100644
--- a/doc/html/index
+++ b/doc/html/index
@@ -74,7 +74,7 @@
"How to Report A Bug" bughowto.html
"How to create a large, sparse QTable" bigtable-example.html
"How to use X11 overlays with the TQt OpenGL extension" opengl-x11-overlays.html
-"IconView Module" iconview.html
+"IconView Widget" iconview.html
"Iconview" iconview-example.html
"In Sync with Outlook" qaxcontainer-example-qutlook.html
"Installation" installation.html
diff --git a/doc/html/titleindex b/doc/html/titleindex
index 7c38f44f2..bd690ed4e 100644
--- a/doc/html/titleindex
+++ b/doc/html/titleindex
@@ -87,7 +87,7 @@ How to Learn TQt | how-to-learn-ntqt.html
How to Report A Bug | bughowto.html
How to create a large, sparse QTable | bigtable-example.html
How to use X11 overlays with the TQt OpenGL extension | opengl-x11-overlays.html
-IconView Module | iconview.html
+IconView Widget | iconview.html
Iconview | iconview-example.html
Image Processing Classes | images.html
Implicitly and Explicitly Shared Classes | shared.html