AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish removing Qt3 support

Browse Source 
Remove the (-no)-qt3support options from configure, and remove the last
remaining references to Qt3Support, QT3_SUPPORT, and
QEvent::ChildInserted.

The compatibilityChildInsertEvents() tests in tst_QObject and
tst_QWidget have been renamed to childEvents(), which is a more
appropriate name.

Change-Id: Id0b45e9b177efcc8dceee8c9ed8afafedeeace2f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Bradley T. Hughes 2011-12-20 14:59:09 +01:00 committed by Qt by Nokia
parent ef03396072
commit ae8c61db21
16 changed files with 45 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
configure vendored
View File

@ -780,7 +780,6 @@ CFG_REDUCE_RELOCATIONS=auto
CFG_NAS=no
CFG_QWS_DEPTHS=all
CFG_ACCESSIBILITY=auto
CFG_QT3SUPPORT=no
CFG_ENDIAN=auto
CFG_HOST_ENDIAN=auto
CFG_DOUBLEFORMAT=auto
@ -1037,7 +1036,7 @@ while [ "$#" -gt 0 ]; do
VAL=no
;;
#Qt style yes options
-incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-v8|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon)
-incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-v8|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
@ -1236,13 +1235,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=no
case "$VAR" in
qt3support)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_QT3SUPPORT="$VAL"
else
UNKNOWN_OPT=yes
fi
;;
accessibility)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_ACCESSIBILITY="$VAL"
@ -2384,20 +2376,6 @@ while [ "$#" -gt 0 ]; do
fi
done
if [ "$CFG_QCONFIG" != "full" ] && [ "$CFG_QT3SUPPORT" = "yes" ]; then
echo "Warning: '-qconfig $CFG_QCONFIG' will disable the qt3support library."
CFG_QT3SUPPORT="no"
fi
if [ "$CFG_GUI" = "no" ]; then
echo "Warning: -no-gui will disable the qt3support library."
CFG_QT3SUPPORT="no"
fi
#disable Qt3Support for Lighthouse
if [ "$PLATFORM_QPA" = "yes" ]; then
CFG_QT3SUPPORT="no"
fi
# update QT_CONFIG to show our current predefined configuration
case "$CFG_QCONFIG" in
minimal|small|medium|large|full)
@ -3665,7 +3643,7 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
[-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile]
[-largefile] [-no-exceptions] [-exceptions] [-no-accessibility]
[-accessibility] [-no-stl] [-stl] [-no-sql-<driver>] [-sql-<driver>]
[-plugin-sql-<driver>] [-system-sqlite] [-no-qt3support] [-qt3support]
[-plugin-sql-<driver>] [-system-sqlite]
[-platform] [-D <string>] [-I <string>] [-L <string>] [-help]
[-qt-zlib] [-system-zlib] [-no-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff]
[-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng]
@ -3807,9 +3785,6 @@ fi
-system-sqlite ..... Use sqlite from the operating system.
-no-qt3support ..... Disables the Qt 3 support functionality.
* -qt3support ........ Enables the Qt 3 support functionality.
-no-xmlpatterns .... Do not build the QtXmlPatterns module.
+ -xmlpatterns ....... Build the QtXmlPatterns module.
QtXmlPatterns is built if a decent C++ compiler
@ -6791,18 +6766,6 @@ fi
# but disable Cocoa if cross-building for mingw
[ "$XPLATFORM_MINGW" = "yes" ] && CFG_MAC_COCOA="no"
# disable Qt 3 support on VxWorks
case "$XPLATFORM" in
unsupported/vxworks*)
CFG_QT3SUPPORT="no"
;;
esac
# enable Qt 3 support functionality
if [ "$CFG_QT3SUPPORT" = "yes" ]; then
QT_CONFIG="$QT_CONFIG gui-qt3support"
fi
# enable Phonon
if [ "$CFG_PHONON" = "yes" ]; then
# No longer needed after modularization
@ -8249,7 +8212,6 @@ if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
else
echo "Debug .................. $CFG_DEBUG"
fi
echo "Qt 3 compatibility ..... $CFG_QT3SUPPORT"
[ "$CFG_DBUS" = "no" ] && echo "QtDBus module .......... no"
[ "$CFG_DBUS" = "yes" ] && echo "QtDBus module .......... yes (run-time)"
[ "$CFG_DBUS" = "linked" ] && echo "QtDBus module .......... yes (linked)"

1
mkspecs/features/qt_module_config.prf
View File

@ -148,7 +148,6 @@ win32-g++* {
contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
contains(QT_CONFIG, gui-qt3support):DEFINES *= QT3_SUPPORT
DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code
DEFINES *= QT_USE_QSTRINGBUILDER

3
src/corelib/kernel/qcoreevent.cpp
View File

@ -108,7 +108,6 @@ QT_BEGIN_NAMESPACE
\value ApplicationPaletteChange The default application palette has changed.
\value ApplicationWindowIconChange The application's icon has changed.
\value ChildAdded An object gets a child (QChildEvent).
\value ChildInserted An object gets a child (QChildEvent). Qt3Support only, use ChildAdded instead.
\value ChildPolished A widget child gets polished (QChildEvent).
\value ChildRemoved An object loses a child (QChildEvent).
\value Clipboard The clipboard contents have changed (QClipboardEvent).
@ -252,8 +251,6 @@ QT_BEGIN_NAMESPACE
\omitvalue AcceptDropsChange
\omitvalue ActivateControl
\omitvalue CaptionChange
\omitvalue ChildInsertedRequest
\omitvalue ChildInserted
\omitvalue Create
\omitvalue DeactivateControl
\omitvalue Destroy

9
src/gui/text/qtextimagehandler.cpp
View File

@ -52,9 +52,6 @@
QT_BEGIN_NAMESPACE
// set by the mime source factory in Qt3Compat
QTextImageHandler::ExternalImageLoaderFunction QTextImageHandler::externalLoader = 0;
static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format)
{
QPixmap pm;
@ -79,9 +76,6 @@ static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format)
context = browser->source().toString();
#endif
QImage img;
if (QTextImageHandler::externalLoader)
img = QTextImageHandler::externalLoader(name, context);
if (img.isNull()) { // try direct loading
name = format.name(); // remove qrc:/ prefix again
if (name.isEmpty() || !img.load(name))
@ -157,9 +151,6 @@ static QImage getImage(QTextDocument *doc, const QTextImageFormat &format)
if (browser)
context = browser->source().toString();
#endif
if (QTextImageHandler::externalLoader)
image = QTextImageHandler::externalLoader(name, context);
if (image.isNull()) { // try direct loading
name = format.name(); // remove qrc:/ prefix again
if (name.isEmpty() || !image.load(name))

3
src/gui/text/qtextimagehandler_p.h
View File

@ -71,9 +71,6 @@ public:
virtual QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format);
virtual void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format);
QImage image(QTextDocument *doc, const QTextImageFormat &imageFormat);
typedef QImage (*ExternalImageLoaderFunction)(const QString &name, const QString &context);
static ExternalImageLoaderFunction externalLoader; //this is needed by Qt3Support
};
QT_END_NAMESPACE

3
src/gui/text/qtextodfwriter.cpp
View File

@ -376,9 +376,6 @@ void QTextOdfWriter::writeInlineCharacter(QXmlStreamWriter &writer, const QTextF
if (image.isNull()) {
QString context;
if (QTextImageHandler::externalLoader)
image = QTextImageHandler::externalLoader(name, context);
if (image.isNull()) { // try direct loading
name = imageFormat.name(); // remove qrc:/ prefix again
image.load(name);

87
src/tools/moc/keywords.cpp
View File

@ -43,12 +43,12 @@
// DO NOT EDIT.
static const short keyword_trans[][128] = {
{0,0,0,0,0,0,0,0,0,541,538,0,0,0,0,0,
{0,0,0,0,0,0,0,0,0,532,529,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
541,252,539,542,0,38,239,540,25,26,236,234,30,235,27,237,
532,252,530,533,0,38,239,531,25,26,236,234,30,235,27,237,
22,22,22,22,22,22,22,22,22,22,34,41,23,39,24,43,
0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
8,21,8,8,8,8,8,8,8,8,8,31,543,32,238,8,
8,21,8,8,8,8,8,8,8,8,8,31,534,32,238,8,
0,1,2,3,4,5,6,7,8,9,8,8,10,11,12,13,
14,8,15,16,17,18,19,20,8,8,8,36,245,37,248,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -190,7 +190,7 @@ static const short keyword_trans[][128] = {
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,42,0,0,0,28,0,
546,546,546,546,546,546,546,546,546,546,0,0,0,0,0,0,
537,537,537,537,537,537,537,537,537,537,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -349,7 +349,7 @@ static const short keyword_trans[][128] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,544,
0,0,0,0,0,0,0,0,0,0,536,0,0,0,0,535,
0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -392,7 +392,7 @@ static const short keyword_trans[][128] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,439,388,378,383,364,0,448,0,0,0,0,0,358,
370,0,530,436,0,0,0,0,0,0,0,0,0,0,0,0,
370,0,521,436,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -415,7 +415,7 @@ static const short keyword_trans[][128] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,513,0,437,0,0,0,465,0,0,471,0,0,0,
0,0,0,504,0,437,0,0,0,465,0,0,471,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@ -424,7 +424,7 @@ static const short keyword_trans[][128] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,450,0,506,0,0,0,0,0,0,0,0,0,
0,0,0,0,450,0,497,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -432,15 +432,7 @@ static const short keyword_trans[][128] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
522,0,0,481,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,497,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,486,
513,0,0,481,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
};
@ -938,7 +930,7 @@ static const struct
{CHARACTER, 0, 79, 483, CHARACTER},
{CHARACTER, 0, 84, 484, CHARACTER},
{Q_PRIVATE_SLOT_TOKEN, 0, 0, 0, CHARACTER},
{CHARACTER, 49, 0, 0, CHARACTER},
{CHARACTER, 0, 95, 486, CHARACTER},
{CHARACTER, 0, 77, 487, CHARACTER},
{CHARACTER, 0, 79, 488, CHARACTER},
{CHARACTER, 0, 67, 489, CHARACTER},
@ -950,46 +942,37 @@ static const struct
{CHARACTER, 0, 65, 495, CHARACTER},
{CHARACTER, 0, 84, 496, CHARACTER},
{Q_MOC_COMPAT_TOKEN, 0, 0, 0, CHARACTER},
{CHARACTER, 0, 95, 498, CHARACTER},
{CHARACTER, 0, 83, 499, CHARACTER},
{CHARACTER, 0, 85, 500, CHARACTER},
{CHARACTER, 0, 80, 501, CHARACTER},
{CHARACTER, 0, 80, 502, CHARACTER},
{CHARACTER, 0, 79, 503, CHARACTER},
{CHARACTER, 0, 82, 504, CHARACTER},
{CHARACTER, 0, 84, 505, CHARACTER},
{Q_QT3_SUPPORT_TOKEN, 0, 0, 0, CHARACTER},
{CHARACTER, 0, 79, 507, CHARACTER},
{CHARACTER, 0, 75, 508, CHARACTER},
{CHARACTER, 0, 79, 498, CHARACTER},
{CHARACTER, 0, 75, 499, CHARACTER},
{CHARACTER, 0, 65, 500, CHARACTER},
{CHARACTER, 0, 66, 501, CHARACTER},
{CHARACTER, 0, 76, 502, CHARACTER},
{CHARACTER, 0, 69, 503, CHARACTER},
{Q_INVOKABLE_TOKEN, 0, 0, 0, CHARACTER},
{CHARACTER, 0, 82, 505, CHARACTER},
{CHARACTER, 0, 73, 506, CHARACTER},
{CHARACTER, 0, 80, 507, CHARACTER},
{CHARACTER, 0, 84, 508, CHARACTER},
{CHARACTER, 0, 65, 509, CHARACTER},
{CHARACTER, 0, 66, 510, CHARACTER},
{CHARACTER, 0, 76, 511, CHARACTER},
{CHARACTER, 0, 69, 512, CHARACTER},
{Q_INVOKABLE_TOKEN, 0, 0, 0, CHARACTER},
{CHARACTER, 0, 82, 514, CHARACTER},
{CHARACTER, 0, 73, 515, CHARACTER},
{CHARACTER, 0, 80, 516, CHARACTER},
{CHARACTER, 0, 84, 517, CHARACTER},
{CHARACTER, 0, 65, 518, CHARACTER},
{CHARACTER, 0, 66, 519, CHARACTER},
{CHARACTER, 0, 76, 520, CHARACTER},
{CHARACTER, 0, 69, 521, CHARACTER},
{Q_SCRIPTABLE_TOKEN, 0, 0, 0, CHARACTER},
{CHARACTER, 0, 82, 523, CHARACTER},
{CHARACTER, 0, 79, 524, CHARACTER},
{CHARACTER, 0, 80, 525, CHARACTER},
{CHARACTER, 0, 69, 526, CHARACTER},
{CHARACTER, 0, 82, 527, CHARACTER},
{CHARACTER, 0, 84, 528, CHARACTER},
{CHARACTER, 0, 89, 529, CHARACTER},
{CHARACTER, 0, 82, 514, CHARACTER},
{CHARACTER, 0, 79, 515, CHARACTER},
{CHARACTER, 0, 80, 516, CHARACTER},
{CHARACTER, 0, 69, 517, CHARACTER},
{CHARACTER, 0, 82, 518, CHARACTER},
{CHARACTER, 0, 84, 519, CHARACTER},
{CHARACTER, 0, 89, 520, CHARACTER},
{Q_PRIVATE_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
{CHARACTER, 0, 69, 531, CHARACTER},
{CHARACTER, 0, 86, 532, CHARACTER},
{CHARACTER, 0, 73, 533, CHARACTER},
{CHARACTER, 0, 83, 534, CHARACTER},
{CHARACTER, 0, 73, 535, CHARACTER},
{CHARACTER, 0, 79, 536, CHARACTER},
{CHARACTER, 0, 78, 537, CHARACTER},
{CHARACTER, 0, 69, 522, CHARACTER},
{CHARACTER, 0, 86, 523, CHARACTER},
{CHARACTER, 0, 73, 524, CHARACTER},
{CHARACTER, 0, 83, 525, CHARACTER},
{CHARACTER, 0, 73, 526, CHARACTER},
{CHARACTER, 0, 79, 527, CHARACTER},
{CHARACTER, 0, 78, 528, CHARACTER},
{Q_REVISION_TOKEN, 0, 0, 0, CHARACTER},
{NEWLINE, 0, 0, 0, NOTOKEN},
{QUOTE, 0, 0, 0, NOTOKEN},

2
src/tools/moc/moc.cpp
View File

@ -165,7 +165,6 @@ Type Moc::parseType()
type.isVolatile = true;
continue;
case Q_MOC_COMPAT_TOKEN:
case Q_QT3_SUPPORT_TOKEN:
case Q_INVOKABLE_TOKEN:
case Q_SCRIPTABLE_TOKEN:
case Q_SIGNALS_TOKEN:
@ -323,7 +322,6 @@ bool Moc::testFunctionAttribute(Token tok, FunctionDef *def)
{
switch (tok) {
case Q_MOC_COMPAT_TOKEN:
case Q_QT3_SUPPORT_TOKEN:
def->isCompat = true;
return true;
case Q_INVOKABLE_TOKEN:

1
src/tools/moc/token.cpp
View File

@ -213,7 +213,6 @@ const char *tokenTypeName(Token t)
case PP_MOC_FALSE: return "PP_MOC_FALSE";
case Q_DECLARE_METATYPE_TOKEN: return "Q_DECLARE_METATYPE_TOKEN";
case Q_MOC_COMPAT_TOKEN: return "Q_MOC_COMPAT_TOKEN";
case Q_QT3_SUPPORT_TOKEN: return "Q_QT3_SUPPORT_TOKEN";
case Q_INVOKABLE_TOKEN: return "Q_INVOKABLE_TOKEN";
case Q_SCRIPTABLE_TOKEN: return "Q_SCRIPTABLE_TOKEN";
}

1
src/tools/moc/token.h
View File

@ -182,7 +182,6 @@ enum Token {
Q_SLOT_TOKEN,
Q_PRIVATE_SLOT_TOKEN,
Q_MOC_COMPAT_TOKEN,
Q_QT3_SUPPORT_TOKEN,
Q_INVOKABLE_TOKEN,
Q_SCRIPTABLE_TOKEN,
Q_PRIVATE_PROPERTY_TOKEN,

1
src/tools/moc/util/generate_keywords.cpp
View File

@ -243,7 +243,6 @@ static const Keyword keywords[] = {
{ "Q_SLOTS", "Q_SLOTS_TOKEN" },
{ "Q_PRIVATE_SLOT", "Q_PRIVATE_SLOT_TOKEN" },
{ "QT_MOC_COMPAT", "Q_MOC_COMPAT_TOKEN" },
{ "QT3_SUPPORT", "Q_QT3_SUPPORT_TOKEN" },
{ "Q_INVOKABLE", "Q_INVOKABLE_TOKEN" },
{ "Q_SIGNAL", "Q_SIGNAL_TOKEN" },
{ "Q_SLOT", "Q_SLOT_TOKEN" },

186
src/tools/uic/qclass_lib_map.h
View File

@ -1160,189 +1160,3 @@ QT_CLASS_LIB(QGraphicsSvgItem, QtSvg, qgraphicssvgitem.h)
QT_CLASS_LIB(QSvgGenerator, QtSvg, qsvggenerator.h)
QT_CLASS_LIB(QSvgRenderer, QtSvg, qsvgrenderer.h)
QT_CLASS_LIB(QSvgWidget, QtSvg, qsvgwidget.h)
QT_CLASS_LIB(Q3CanvasItemList, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasItem, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3Canvas, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasView, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasPixmap, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasPixmapArray, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasSprite, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasPolygonalItem, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasRectangle, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasPolygon, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasSpline, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasLine, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasEllipse, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3CanvasText, Qt3Support, q3canvas.h)
QT_CLASS_LIB(Q3FileIconProvider, Qt3Support, q3filedialog.h)
QT_CLASS_LIB(Q3FilePreview, Qt3Support, q3filedialog.h)
QT_CLASS_LIB(Q3FileDialog, Qt3Support, q3filedialog.h)
QT_CLASS_LIB(Q3ProgressDialog, Qt3Support, q3progressdialog.h)
QT_CLASS_LIB(Q3TabDialog, Qt3Support, q3tabdialog.h)
QT_CLASS_LIB(Q3Wizard, Qt3Support, q3wizard.h)
QT_CLASS_LIB(Q3IconDragItem, Qt3Support, q3iconview.h)
QT_CLASS_LIB(Q3IconDrag, Qt3Support, q3iconview.h)
QT_CLASS_LIB(Q3IconViewItem, Qt3Support, q3iconview.h)
QT_CLASS_LIB(Q3IconView, Qt3Support, q3iconview.h)
QT_CLASS_LIB(Q3ListBox, Qt3Support, q3listbox.h)
QT_CLASS_LIB(Q3ListBoxItem, Qt3Support, q3listbox.h)
QT_CLASS_LIB(Q3ListBoxText, Qt3Support, q3listbox.h)
QT_CLASS_LIB(Q3ListBoxPixmap, Qt3Support, q3listbox.h)
QT_CLASS_LIB(Q3ListViewItem, Qt3Support, q3listview.h)
QT_CLASS_LIB(Q3ListView, Qt3Support, q3listview.h)
QT_CLASS_LIB(Q3CheckListItem, Qt3Support, q3listview.h)
QT_CLASS_LIB(Q3ListViewItemIterator, Qt3Support, q3listview.h)
QT_CLASS_LIB(Q3TableSelection, Qt3Support, q3table.h)
QT_CLASS_LIB(Q3TableItem, Qt3Support, q3table.h)
QT_CLASS_LIB(Q3ComboTableItem, Qt3Support, q3table.h)
QT_CLASS_LIB(Q3CheckTableItem, Qt3Support, q3table.h)
QT_CLASS_LIB(Q3Table, Qt3Support, q3table.h)
QT_CLASS_LIB(Q3Dns, Qt3Support, q3dns.h)
QT_CLASS_LIB(Q3DnsSocket, Qt3Support, q3dns.h)
QT_CLASS_LIB(Q3Ftp, Qt3Support, q3ftp.h)
QT_CLASS_LIB(Q3HttpHeader, Qt3Support, q3http.h)
QT_CLASS_LIB(Q3HttpResponseHeader, Qt3Support, q3http.h)
QT_CLASS_LIB(Q3HttpRequestHeader, Qt3Support, q3http.h)
QT_CLASS_LIB(Q3Http, Qt3Support, q3http.h)
QT_CLASS_LIB(Q3LocalFs, Qt3Support, q3localfs.h)
QT_CLASS_LIB(Q3NetworkProtocolFactoryBase, Qt3Support, q3networkprotocol.h)
QT_CLASS_LIB(Q3NetworkProtocolFactory, Qt3Support, q3networkprotocol.h)
QT_CLASS_LIB(Q3NetworkProtocolDict, Qt3Support, q3networkprotocol.h)
QT_CLASS_LIB(Q3NetworkProtocol, Qt3Support, q3networkprotocol.h)
QT_CLASS_LIB(Q3NetworkOperation, Qt3Support, q3networkprotocol.h)
QT_CLASS_LIB(Q3ServerSocket, Qt3Support, q3serversocket.h)
QT_CLASS_LIB(Q3Socket, Qt3Support, q3socket.h)
QT_CLASS_LIB(Q3SocketDevice, Qt3Support, q3socketdevice.h)
QT_CLASS_LIB(Q3Url, Qt3Support, q3url.h)
QT_CLASS_LIB(Q3UrlOperator, Qt3Support, q3urloperator.h)
QT_CLASS_LIB(Q3Accel, Qt3Support, q3accel.h)
QT_CLASS_LIB(Q3BoxLayout, Qt3Support, q3boxlayout.h)
QT_CLASS_LIB(Q3HBoxLayout, Qt3Support, q3boxlayout.h)
QT_CLASS_LIB(Q3VBoxLayout, Qt3Support, q3boxlayout.h)
QT_CLASS_LIB(Q3DragObject, Qt3Support, q3dragobject.h)
QT_CLASS_LIB(Q3StoredDrag, Qt3Support, q3dragobject.h)
QT_CLASS_LIB(Q3TextDrag, Qt3Support, q3dragobject.h)
QT_CLASS_LIB(Q3ImageDrag, Qt3Support, q3dragobject.h)
QT_CLASS_LIB(Q3UriDrag, Qt3Support, q3dragobject.h)
QT_CLASS_LIB(Q3ColorDrag, Qt3Support, q3dragobject.h)
QT_CLASS_LIB(Q3DropSite, Qt3Support, q3dropsite.h)
QT_CLASS_LIB(Q3GridLayout, Qt3Support, q3gridlayout.h)
QT_CLASS_LIB(Q3MimeSourceFactory, Qt3Support, q3mimefactory.h)
QT_CLASS_LIB(Q3PolygonScanner, Qt3Support, q3polygonscanner.h)
QT_CLASS_LIB(Q3Process, Qt3Support, q3process.h)
QT_CLASS_LIB(Q3PaintDeviceMetrics, Qt3Support, q3paintdevicemetrics.h)
QT_CLASS_LIB(Q3Painter, Qt3Support, q3painter.h)
QT_CLASS_LIB(Q3Picture, Qt3Support, q3picture.h)
QT_CLASS_LIB(Q3PointArray, Qt3Support, q3pointarray.h)
QT_CLASS_LIB(Q3DataBrowser, Qt3Support, q3databrowser.h)
QT_CLASS_LIB(Q3DataTable, Qt3Support, q3datatable.h)
QT_CLASS_LIB(Q3DataView, Qt3Support, q3dataview.h)
QT_CLASS_LIB(Q3EditorFactory, Qt3Support, q3editorfactory.h)
QT_CLASS_LIB(Q3SqlCursor, Qt3Support, q3sqlcursor.h)
QT_CLASS_LIB(Q3SqlEditorFactory, Qt3Support, q3sqleditorfactory.h)
QT_CLASS_LIB(Q3SqlFieldInfo, Qt3Support, q3sqlfieldinfo.h)
QT_CLASS_LIB(Q3SqlForm, Qt3Support, q3sqlform.h)
QT_CLASS_LIB(Q3SqlPropertyMap, Qt3Support, q3sqlpropertymap.h)
QT_CLASS_LIB(Q3SqlFieldInfoList, Qt3Support, q3sqlrecordinfo.h)
QT_CLASS_LIB(Q3SqlRecordInfo, Qt3Support, q3sqlrecordinfo.h)
QT_CLASS_LIB(Q3SqlSelectCursor, Qt3Support, q3sqlselectcursor.h)
QT_CLASS_LIB(Q3MultiLineEdit, Qt3Support, q3multilineedit.h)
QT_CLASS_LIB(Q3SimpleRichText, Qt3Support, q3simplerichtext.h)
QT_CLASS_LIB(Q3StyleSheetItem, Qt3Support, q3stylesheet.h)
QT_CLASS_LIB(Q3StyleSheet, Qt3Support, q3stylesheet.h)
QT_CLASS_LIB(Q3SyntaxHighlighter, Qt3Support, q3syntaxhighlighter.h)
QT_CLASS_LIB(Q3TextBrowser, Qt3Support, q3textbrowser.h)
QT_CLASS_LIB(Q3TextEditOptimPrivate, Qt3Support, q3textedit.h)
QT_CLASS_LIB(Q3TextEdit, Qt3Support, q3textedit.h)
QT_CLASS_LIB(Q3TextStream, Qt3Support, q3textstream.h)
QT_CLASS_LIB(Q3TSFUNC, Qt3Support, q3textstream.h)
QT_CLASS_LIB(Q3TextView, Qt3Support, q3textview.h)
QT_CLASS_LIB(Q3AsciiCache, Qt3Support, q3asciicache.h)
QT_CLASS_LIB(Q3AsciiCacheIterator, Qt3Support, q3asciicache.h)
QT_CLASS_LIB(Q3AsciiDict, Qt3Support, q3asciidict.h)
QT_CLASS_LIB(Q3AsciiDictIterator, Qt3Support, q3asciidict.h)
QT_CLASS_LIB(Q3Cache, Qt3Support, q3cache.h)
QT_CLASS_LIB(Q3CacheIterator, Qt3Support, q3cache.h)
QT_CLASS_LIB(Q3CleanupHandler, Qt3Support, q3cleanuphandler.h)
QT_CLASS_LIB(Q3SingleCleanupHandler, Qt3Support, q3cleanuphandler.h)
QT_CLASS_LIB(Q3CString, Qt3Support, q3cstring.h)
QT_CLASS_LIB(Q3DeepCopy, Qt3Support, q3deepcopy.h)
QT_CLASS_LIB(Q3Dict, Qt3Support, q3dict.h)
QT_CLASS_LIB(Q3DictIterator, Qt3Support, q3dict.h)
QT_CLASS_LIB(Q3GArray, Qt3Support, q3garray.h)
QT_CLASS_LIB(Q3GCache, Qt3Support, q3gcache.h)
QT_CLASS_LIB(Q3GCacheIterator, Qt3Support, q3gcache.h)
QT_CLASS_LIB(Q3BaseBucket, Qt3Support, q3gdict.h)
QT_CLASS_LIB(Q3StringBucket, Qt3Support, q3gdict.h)
QT_CLASS_LIB(Q3AsciiBucket, Qt3Support, q3gdict.h)
QT_CLASS_LIB(Q3IntBucket, Qt3Support, q3gdict.h)
QT_CLASS_LIB(Q3PtrBucket, Qt3Support, q3gdict.h)
QT_CLASS_LIB(Q3GDict, Qt3Support, q3gdict.h)
QT_CLASS_LIB(Q3GDictIterator, Qt3Support, q3gdict.h)
QT_CLASS_LIB(Q3LNode, Qt3Support, q3glist.h)
QT_CLASS_LIB(Q3GList, Qt3Support, q3glist.h)
QT_CLASS_LIB(Q3GListIterator, Qt3Support, q3glist.h)
QT_CLASS_LIB(Q3GListStdIterator, Qt3Support, q3glist.h)
QT_CLASS_LIB(Q3GVector, Qt3Support, q3gvector.h)
QT_CLASS_LIB(Q3IntCache, Qt3Support, q3intcache.h)
QT_CLASS_LIB(Q3IntCacheIterator, Qt3Support, q3intcache.h)
QT_CLASS_LIB(Q3IntDict, Qt3Support, q3intdict.h)
QT_CLASS_LIB(Q3IntDictIterator, Qt3Support, q3intdict.h)
QT_CLASS_LIB(Q3MemArray, Qt3Support, q3memarray.h)
QT_CLASS_LIB(Q3ObjectDictionary, Qt3Support, q3objectdict.h)
QT_CLASS_LIB(Q3PtrCollection, Qt3Support, q3ptrcollection.h)
QT_CLASS_LIB(Q3PtrDict, Qt3Support, q3ptrdict.h)
QT_CLASS_LIB(Q3PtrDictIterator, Qt3Support, q3ptrdict.h)
QT_CLASS_LIB(Q3PtrListStdIterator, Qt3Support, q3ptrlist.h)
QT_CLASS_LIB(Q3PtrList, Qt3Support, q3ptrlist.h)
QT_CLASS_LIB(Q3PtrListIterator, Qt3Support, q3ptrlist.h)
QT_CLASS_LIB(Q3PtrQueue, Qt3Support, q3ptrqueue.h)
QT_CLASS_LIB(Q3PtrStack, Qt3Support, q3ptrstack.h)
QT_CLASS_LIB(Q3PtrVector, Qt3Support, q3ptrvector.h)
QT_CLASS_LIB(Q3Semaphore, Qt3Support, q3semaphore.h)
QT_CLASS_LIB(Q3Shared, Qt3Support, q3shared.h)
QT_CLASS_LIB(Q3Signal, Qt3Support, q3signal.h)
QT_CLASS_LIB(Q3SortedList, Qt3Support, q3sortedlist.h)
QT_CLASS_LIB(Q3StrListIterator, Qt3Support, q3strlist.h)
QT_CLASS_LIB(Q3StrListIterator, Qt3Support, q3strlist.h)
QT_CLASS_LIB(Q3StrList, Qt3Support, q3strlist.h)
QT_CLASS_LIB(Q3StrIList, Qt3Support, q3strlist.h)
QT_CLASS_LIB(Q3StrVec, Qt3Support, q3strvec.h)
QT_CLASS_LIB(Q3StrIVec, Qt3Support, q3strvec.h)
QT_CLASS_LIB(Q3ValueListIterator, Qt3Support, q3valuelist.h)
QT_CLASS_LIB(Q3ValueListConstIterator, Qt3Support, q3valuelist.h)
QT_CLASS_LIB(Q3ValueList, Qt3Support, q3valuelist.h)
QT_CLASS_LIB(Q3ValueStack, Qt3Support, q3valuestack.h)
QT_CLASS_LIB(Q3ValueVector, Qt3Support, q3valuevector.h)
QT_CLASS_LIB(Q3Action, Qt3Support, q3action.h)
QT_CLASS_LIB(Q3ActionGroup, Qt3Support, q3action.h)
QT_CLASS_LIB(Q3Button, Qt3Support, q3button.h)
QT_CLASS_LIB(Q3ButtonGroup, Qt3Support, q3buttongroup.h)
QT_CLASS_LIB(Q3VButtonGroup, Qt3Support, q3buttongroup.h)
QT_CLASS_LIB(Q3HButtonGroup, Qt3Support, q3buttongroup.h)
QT_CLASS_LIB(Q3ComboBox, Qt3Support, q3combobox.h)
QT_CLASS_LIB(Q3DateTimeEditBase, Qt3Support, q3datetimeedit.h)
QT_CLASS_LIB(Q3DateEdit, Qt3Support, q3datetimeedit.h)
QT_CLASS_LIB(Q3TimeEdit, Qt3Support, q3datetimeedit.h)
QT_CLASS_LIB(Q3DateTimeEdit, Qt3Support, q3datetimeedit.h)
QT_CLASS_LIB(Q3DockAreaLayout, Qt3Support, q3dockarea.h)
QT_CLASS_LIB(Q3DockArea, Qt3Support, q3dockarea.h)
QT_CLASS_LIB(Q3DockWindow, Qt3Support, q3dockwindow.h)
QT_CLASS_LIB(Q3Frame, Qt3Support, q3frame.h)
QT_CLASS_LIB(Q3Grid, Qt3Support, q3grid.h)
QT_CLASS_LIB(Q3GridView, Qt3Support, q3gridview.h)
QT_CLASS_LIB(Q3GroupBox, Qt3Support, q3groupbox.h)
QT_CLASS_LIB(Q3HBox, Qt3Support, q3hbox.h)
QT_CLASS_LIB(Q3Header, Qt3Support, q3header.h)
QT_CLASS_LIB(Q3HGroupBox, Qt3Support, q3hgroupbox.h)
QT_CLASS_LIB(Q3MainWindow, Qt3Support, q3mainwindow.h)
QT_CLASS_LIB(Q3PopupMenu, Qt3Support, q3popupmenu.h)
QT_CLASS_LIB(Q3ProgressBar, Qt3Support, q3progressbar.h)
QT_CLASS_LIB(Q3RangeControl, Qt3Support, q3rangecontrol.h)
QT_CLASS_LIB(Q3SpinWidget, Qt3Support, q3rangecontrol.h)
QT_CLASS_LIB(Q3ScrollView, Qt3Support, q3scrollview.h)
QT_CLASS_LIB(Q3ToolBar, Qt3Support, q3toolbar.h)
QT_CLASS_LIB(Q3VBox, Qt3Support, q3vbox.h)
QT_CLASS_LIB(Q3VGroupBox, Qt3Support, q3vgroupbox.h)
QT_CLASS_LIB(Q3WhatsThis, Qt3Support, q3whatsthis.h)
QT_CLASS_LIB(Q3WidgetStack, Qt3Support, q3widgetstack.h)

2
src/widgets/widgets/qfocusframe.cpp
View File

@ -147,7 +147,7 @@ void QFocusFrame::initStyleOption(QStyleOption *option) const
The focus frame will not monitor \a parent for updates but rather
can be placed manually or by using QFocusFrame::setWidget. A
QFocusFrame sets Qt::WA_NoChildEventsForParent attribute; as a
result the parent will not receive a QEvent::ChildInserted event,
result the parent will not receive a QEvent::ChildAdded event,
this will make it possible to manually set the geometry of the
QFocusFrame inside of a QSplitter or other child event monitoring
widget.

8
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
View File

@ -97,7 +97,7 @@ private slots:
void recursiveSignalEmission();
#endif
void blockingQueuedConnection();
void compatibilityChildInsertedEvents();
void childEvents();
void installEventFilter();
void deleteSelfInSlot();
void disconnectSelfInSlotAndDeleteAfterEmit();
@ -2868,7 +2868,7 @@ private:
EventList events;
};
void tst_QObject::compatibilityChildInsertedEvents()
void tst_QObject::childEvents()
{
EventSpy::EventList expected;
@ -2889,7 +2889,7 @@ void tst_QObject::compatibilityChildInsertedEvents()
}
{
// 2 children, so we expect 2 ChildAdded and 2 ChildInserted events
// 2 children, so we expect 2 ChildAdded events
QObject object;
EventSpy spy;
object.installEventFilter(&spy);
@ -2920,7 +2920,7 @@ void tst_QObject::compatibilityChildInsertedEvents()
{
// 2 children, but one is reparented away, so we expect:
// 2 ChildAdded, 1 ChildRemoved, and 1 ChildInserted
// 2 ChildAdded, 1 ChildRemoved
QObject object;
EventSpy spy;
object.installEventFilter(&spy);

4
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -301,7 +301,7 @@ private slots:
void clean_qt_x11_enforce_cursor();
#endif
void compatibilityChildInsertedEvents();
void childEvents();
void render();
void renderInvisible();
void renderWithPainter();
@ -5806,7 +5806,7 @@ private:
EventList events;
};
void tst_QWidget::compatibilityChildInsertedEvents()
void tst_QWidget::childEvents()
{
EventRecorder::EventList expected;
bool accessibilityEnabled = false;

14
tools/configure/configureapp.cpp
View File

@ -317,7 +317,6 @@ Configure::Configure(int& argc, char** argv)
dictionary[ "LIBMNG" ] = "auto";
dictionary[ "FREETYPE" ] = "yes";
dictionary[ "QT3SUPPORT" ] = "no";
dictionary[ "ACCESSIBILITY" ] = "yes";
dictionary[ "OPENGL" ] = "yes";
dictionary[ "OPENVG" ] = "no";
@ -685,10 +684,6 @@ void Configure::parseCmdLine()
else if (configCmdLine.at(i) == "-no-style-cde")
dictionary[ "STYLE_CDE" ] = "no";
// Qt 3 Support ---------------------------------------------
else if (configCmdLine.at(i) == "-no-qt3support")
dictionary[ "QT3SUPPORT" ] = "no";
// Work around compiler nesting limitation
else
continueElse[1] = true;
@ -1444,7 +1439,6 @@ void Configure::applySpecSpecifics()
dictionary[ "STYLE_MOTIF" ] = "no";
dictionary[ "STYLE_CDE" ] = "no";
dictionary[ "FREETYPE" ] = "no";
dictionary[ "QT3SUPPORT" ] = "no";
dictionary[ "OPENGL" ] = "no";
dictionary[ "OPENSSL" ] = "no";
dictionary[ "STL" ] = "no";
@ -1476,7 +1470,6 @@ void Configure::applySpecSpecifics()
dictionary[ "KBD_DRIVERS" ] = "tty";
dictionary[ "GFX_DRIVERS" ] = "linuxfb vnc";
dictionary[ "MOUSE_DRIVERS" ] = "pc linuxtp";
dictionary[ "QT3SUPPORT" ] = "no";
dictionary[ "OPENGL" ] = "no";
dictionary[ "EXCEPTIONS" ] = "no";
dictionary[ "DBUS"] = "no";
@ -1552,7 +1545,7 @@ bool Configure::displayHelp()
"[-qt-zlib] [-system-zlib] [-no-gif] [-no-libpng]\n"
"[-qt-libpng] [-system-libpng] [-no-libtiff] [-qt-libtiff]\n"
"[-system-libtiff] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg]\n"
"[-no-libmng] [-qt-libmng] [-system-libmng] [-no-qt3support] [-mmx]\n"
"[-no-libmng] [-qt-libmng] [-system-libmng] [-mmx]\n"
"[-no-mmx] [-3dnow] [-no-3dnow] [-sse] [-no-sse] [-sse2] [-no-sse2]\n"
"[-no-iwmmxt] [-iwmmxt] [-openssl] [-openssl-linked]\n"
"[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n"
@ -1636,7 +1629,6 @@ bool Configure::displayHelp()
desc( "-system-sqlite", "Use sqlite from the operating system.\n");
desc("QT3SUPPORT", "no","-no-qt3support", "Disables the Qt 3 support functionality.\n");
desc("OPENGL", "no","-no-opengl", "Disables OpenGL functionality\n");
desc("OPENGL", "no","-opengl <api>", "Enable OpenGL support with specified API version.\n"
"Available values for <api>:");
@ -2438,9 +2430,6 @@ void Configure::generateOutputVars()
if (!dictionary["QT_LFLAGS_SQLITE"].isEmpty())
qmakeVars += "QT_LFLAGS_SQLITE += " + escapeSeparators(dictionary["QT_LFLAGS_SQLITE"]);
if (dictionary[ "QT3SUPPORT" ] == "yes")
qtConfig += "gui-qt3support";
if (dictionary[ "OPENGL" ] == "yes")
qtConfig += "opengl";
@ -3225,7 +3214,6 @@ void Configure::displayConfig()
cout << "V8 support.................." << dictionary[ "V8" ] << endl;
cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl;
cout << "QtScriptTools support......." << dictionary[ "SCRIPTTOOLS" ] << endl;
cout << "Qt3 compatibility..........." << dictionary[ "QT3SUPPORT" ] << endl;
cout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl << endl;
cout << "Third Party Libraries:" << endl;