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

Merge remote branch 'gerrit/master' into refactor

Browse Source 
Conflicts:
	config.tests/unix/opengldesktop/opengldesktop.cpp
	examples/itemviews/interview/interview.pro
	examples/mainwindows/mainwindow/mainwindow.pro
	examples/openvg/README
	examples/richtext/textedit/textedit.pro
	examples/tools/undo/undo.pro
	src/corelib/global/qglobal.h
	src/corelib/kernel/qcoreapplication.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qmetatype.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qevent.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/painting/qpaintengine_raster_p.h
	src/gui/text/qfontdatabase.cpp
	src/opengl/qgl.h
	src/openvg/qpaintengine_vg.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	tests/auto/qmainwindow/qmainwindow.pro

Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
This commit is contained in:
Lars Knoll 2011-07-06 13:55:40 +02:00
commit 314fdbce8c
658 changed files with 2912 additions and 74866 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.tests/unix/ipv6/ipv6.pro
View File

@ -1,3 +0,0 @@
SOURCES = ipv6test.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle

69
config.tests/unix/ipv6/ipv6test.cpp
View File

@ -1,69 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the config.tests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
/* Sample program for configure to test IPv6 support on target
platforms. We check for the required IPv6 data structures. */
#if defined(__hpux)
#define _HPUX_SOURCE
#endif
#ifdef __MINGW32__
#include <winsock2.h>
#include <ws2tcpip.h>
#else
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#endif
int main()
{
sockaddr_in6 tmp;
sockaddr_storage tmp2;
(void)tmp.sin6_addr.s6_addr;
(void)tmp.sin6_port;
(void)tmp.sin6_family;
(void)tmp.sin6_scope_id;
(void)tmp2;
return 0;
}

3
config.tests/unix/opengldesktop/opengldesktop.pro
View File

@ -7,3 +7,6 @@ for(p, QMAKE_LIBDIR_OPENGL) {
CONFIG -= qt
LIBS += $$QMAKE_LIBS_OPENGL
mac:DEFINES += Q_OS_MAC
CONFIG -= app_bundle

32
configure vendored
View File

@ -778,12 +778,11 @@ CFG_SSE4_1=auto
CFG_SSE4_2=auto
CFG_AVX=auto
CFG_REDUCE_RELOCATIONS=no
CFG_IPV6=auto
CFG_NAS=no
CFG_QWS_DEPTHS=all
CFG_USER_BUILD_KEY=
CFG_ACCESSIBILITY=auto
CFG_QT3SUPPORT=yes
CFG_QT3SUPPORT=no
CFG_ENDIAN=auto
CFG_HOST_ENDIAN=auto
CFG_DOUBLEFORMAT=auto
@ -3691,10 +3690,6 @@ if [ "$OPT_HELP" = "yes" ]; then
SHY=" "
SHN="*"
fi
if [ "$CFG_IPV6" = "auto" ]; then
I6Y="*"
I6N=" "
fi
if [ "$CFG_PRECOMPILE" = "auto" ] || [ "$CFG_PRECOMPILE" = "no" ]; then
PHY=" "
PHN="*"
@ -6632,26 +6627,6 @@ if [ "$CFG_STL" != "no" ]; then
fi
fi
# find if the platform supports IPv6
if [ "$CFG_IPV6" != "no" ]; then
if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
#IPV6 should always be enabled for Symbian release
CFG_IPV6=yes
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
CFG_IPV6=yes
else
if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
echo "IPv6 support cannot be enabled due to functionality tests!"
echo " Turn on verbose messaging (-v) to $0 to see the final report."
echo " If you believe this message is in error you may use the continue"
echo " switch (-continue) to $0 to continue."
exit 101
else
CFG_IPV6=no
fi
fi
fi
# detect POSIX clock_gettime()
if [ "$CFG_CLOCK_GETTIME" = "auto" ]; then
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/clock-gettime "POSIX clock_gettime()" $L_FLAGS $I_FLAGS $l_FLAGS; then
@ -7176,9 +7151,6 @@ fi
[ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
[ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
if [ "$CFG_IPV6" = "yes" ]; then
QT_CONFIG="$QT_CONFIG ipv6"
fi
if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then
QT_CONFIG="$QT_CONFIG clock-gettime"
fi
@ -8222,7 +8194,6 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
[ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB"
[ "$CFG_S60" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_S60"
[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
[ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
[ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
@ -8735,7 +8706,6 @@ if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
echo "NEON support ........... ${CFG_NEON}"
fi
[ "${PLATFORM_QWS}" != "yes" -a "${PLATFORM_QPA}" != "yes" ] && echo "Graphics System ........ $CFG_GRAPHICS_SYSTEM"
echo "IPv6 support ........... $CFG_IPV6"
echo "IPv6 ifname support .... $CFG_IPV6IFNAME"
echo "getaddrinfo support .... $CFG_GETADDRINFO"
echo "getifaddrs support ..... $CFG_GETIFADDRS"

12
dist/README vendored
View File

@ -31,16 +31,14 @@ follow these instructions:
http://qt.nokia.com/doc/%SHORTVERSION%/install-symbian-installer.html
DEMOS AND EXAMPLES
EXAMPLES
Once Qt is installed, we suggest that you take a look at the demos and
examples to see Qt in action.
Once Qt is installed, we suggest that you take a look at the examples
to see Qt in action.
For desktop computers, run the Qt Examples and Demos either by
typing 'qtdemo' on the command line or through the desktop's Start
menu. On Mac OS X, you can find it in /Developers/Applications/Qt.
For desktop computers, run the Qt Examples by opening them in Qt Creator.
For embedded devices, launch the Qt 'fluidlauncher' demo, either through
For embedded devices, launch the Qt 'fluidlauncher' example, either through
the platforms filebrowser or the built in menu system.

130
dist/changes-5.0.0 vendored Normal file
View File

@ -0,0 +1,130 @@
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Qt Bug Tracker:
http://bugreports.qt.nokia.com/
Each of these identifiers can be entered in the bug tracker to obtain more
information about a particular change.
****************************************************************************
* Source incompatible changes *
****************************************************************************
- QSslCertificate::subjectInfo() and QSslCertificate::issuerInfo() now
return a QStringList instead of a QString
- Unite clipping support has been removed from QPainter. The alternative is
to unite QRegion's and using the result on QPainter.
****************************************************************************
* General *
****************************************************************************
General Improvements
--------------------
-
Third party components
----------------------
-
****************************************************************************
* Library *
****************************************************************************
QtCore
------
QtGui
-----
QtNetwork
---------
QtOpenGL
--------
QtScript
--------
****************************************************************************
* Database Drivers *
****************************************************************************
****************************************************************************
* Platform Specific Changes *
****************************************************************************
Qt for Linux/X11
----------------
Qt for Windows
--------------
Qt for Mac OS X
---------------
Qt for Embedded Linux
---------------------
Qt for Windows CE
-----------------
****************************************************************************
* Compiler Specific Changes *
****************************************************************************
****************************************************************************
* Tools *
****************************************************************************
- Build System
- Assistant
- Designer
- Linguist
- rcc
- moc
- uic
- uic3
- qmake
- configure
- qtconfig
****************************************************************************
* Plugins *
****************************************************************************
****************************************************************************
* Important Behavior Changes *
****************************************************************************

2
doc/src/demos/affine.qdoc
View File

@ -26,7 +26,7 @@
****************************************************************************/
/*!
\example demos/affine
\example painting/affine
\title Affine Transformations
In this demo we show Qt's ability to perform affine transformations

2
doc/src/demos/books.qdoc → doc/src/examples/books.qdoc
View File

@ -26,7 +26,7 @@
****************************************************************************/
/*!
\example demos/books
\example sql/books
\title Books Demonstration
The Books demonstration shows how Qt's SQL classes can be used with the model/view

2
doc/src/demos/boxes.qdoc → doc/src/examples/boxes.qdoc
View File

@ -26,7 +26,7 @@
****************************************************************************/
/*!
\example demos/boxes
\example graphicsview/boxes
\title Boxes
This demo shows Qt's ability to combine advanced OpenGL rendering with the

2
doc/src/demos/chip.qdoc → doc/src/examples/chip.qdoc
View File

@ -26,7 +26,7 @@
****************************************************************************/
/*!
\example demos/chip
\example graphicsview/chip
\title 40000 Chips
This demo shows how to visualize a huge scene with 40000 chip items

2
doc/src/demos/composition.qdoc → doc/src/examples/composition.qdoc
View File

@ -26,7 +26,7 @@
****************************************************************************/
/*!
\example demos/composition
\example painting/composition
\title Composition Modes
This demo shows some of the more advanced composition modes supported by Qt.

4
doc/src/demos/deform.qdoc → doc/src/examples/deform.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/deform
\example painting/deform
\title Vector Deformation
This demo shows how to use advanced vector techniques to draw text
This example shows how to use advanced vector techniques to draw text
using a \c QPainterPath.
\image deform-demo.png

4
doc/src/demos/digiflip.qdoc → doc/src/examples/digiflip.qdoc
View File

@ -26,6 +26,6 @@
****************************************************************************/
/*!
\example demos/embedded/digiflip
\title Digiflip Demonstration
\example embedded/digiflip
\title Digiflip
*/

2
doc/src/demos/embeddeddialogs.qdoc → doc/src/examples/embeddeddialogs.qdoc
View File

@ -26,7 +26,7 @@
****************************************************************************/
/*!
\example demos/embeddeddialogs
\example graphicsview/embeddeddialogs
\title Embedded Dialogs
This example shows how to embed standard dialogs into

4
doc/src/demos/flickable.qdoc → doc/src/examples/flickable.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/flickable
\title Flickable List Demonstration
\example embedded/flickable
\title Flickable List
\image flickable-demo.png
*/

4
doc/src/demos/flightinfo.qdoc → doc/src/examples/flightinfo.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/flightinfo
\title Flight Info Demonstration
\example embedded/flightinfo
\title Flight Info
\image flightinfo-demo.png
*/

4
doc/src/demos/gradients.qdoc → doc/src/examples/gradients.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/gradients
\example painting/gradients
\title Gradients
In this demo we show the various types of gradients that can
In this example we show the various types of gradients that can
be used in Qt.
\image gradients-demo.png

4
doc/src/demos/interview.qdoc → doc/src/examples/interview.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/interview
\example itemviews/interview
\title Interview
The Interview demonstration explores the flexibility and scalability of the
The Interview example explores the flexibility and scalability of the
model/view framework by presenting an infinitely deep data structure using a model
and three different types of view.

4
doc/src/demos/lightmaps.qdoc → doc/src/examples/lightmaps.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/lightmaps
\title Light Maps Demonstration
\example embedded/lightmaps
\title Light Maps
\image lightmaps-demo.png
*/

8
doc/src/demos/macmainwindow.qdoc → doc/src/examples/macmainwindow.qdoc
View File

@ -26,17 +26,17 @@
****************************************************************************/
/*!
\example demos/macmainwindow
\title Mac Main Window Demo
\example mainwindows/macmainwindow
\title Mac Main Window Example
This demo shows how to create a main window that has the
This example shows how to create a main window that has the
same appearance as other Mac OS X applications such as Mail or iTunes.
This includes customizing the item views and QSplitter and wrapping native
widgets such as the search field.
\image macmainwindow.png
See \c{$QTDIR/demos/macmainwindow} for the source code.
See \c{$QTDIR/examples/mainwindows/macmainwindow} for the source code.
*/

4
doc/src/demos/mainwindow.qdoc → doc/src/examples/mainwindow.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/mainwindow
\example mainwindows/mainwindow
\title Main Window
The Main Window demonstration shows Qt's extensive support for tool bars,
The Main Window example shows Qt's extensive support for tool bars,
dock windows, menus, and other standard application features.
\image mainwindow-demo.png

4
doc/src/demos/pathstroke.qdoc → doc/src/examples/pathstroke.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/pathstroke
\example painting/pathstroke
\title Path Stroking
In this demo we show some of the various types of pens that can be
In this example we show some of the various types of pens that can be
used in Qt.
\image pathstroke-demo.png

4
doc/src/demos/raycasting.qdoc → doc/src/examples/raycasting.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/raycasting
\title Ray Casting Demonstration
\example embedded/raycasting
\title Ray Casting
\image raycasting-demo.png
*/

4
doc/src/demos/spreadsheet.qdoc → doc/src/examples/spreadsheet.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/spreadsheet
\example itemviews/spreadsheet
\title Spreadsheet
The Spreadsheet demonstration shows how a table view can be used to create a
The Spreadsheet example shows how a table view can be used to create a
simple spreadsheet application. Custom delegates are used to render different
types of data in distinctive colors.

4
doc/src/demos/sqlbrowser.qdoc → doc/src/examples/sqlbrowser.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/sqlbrowser
\example sql/sqlbrowser
\title SQL Browser
The SQL Browser demonstration shows how a data browser can be used to visualize
The SQL Browser example shows how a data browser can be used to visualize
the results of SQL statements on a live database.
\image sqlbrowser-demo.png

4
doc/src/demos/styledemo.qdoc → doc/src/examples/styledemo.qdoc
View File

@ -26,8 +26,8 @@
****************************************************************************/
/*!
\example demos/embedded/styledemo
\title Embedded Styles Demonstration
\example embedded/styledemo
\title Embedded Styles
\image styledemo-demo.png
*/

4
doc/src/demos/sub-attaq.qdoc → doc/src/examples/sub-attaq.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/sub-attaq
\example animation/sub-attaq
\title Sub-Attaq
This demo shows Qt's ability to combine \l{The Animation Framework}{the animation framework}
This example shows Qt's ability to combine \l{The Animation Framework}{the animation framework}
and \l{The State Machine Framework}{the state machine framework} to create a game.
\image sub-attaq-demo.png

4
doc/src/demos/textedit.qdoc → doc/src/examples/textedit.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/textedit
\example richtext/textedit
\title Text Edit
The Text Edit demonstration shows Qt's rich text editing facilities in action,
The Text Edit example shows Qt's rich text editing facilities in action,
providing an example document for you to experiment with.
\image textedit-demo.png

6
doc/src/examples/transformations.qdoc
View File

@ -364,8 +364,8 @@
QTransform documentation.
The Qt reference documentation provides several painting
demos. Among these is the \l {demos/affine}{Affine
Transformations} demo that shows Qt's ability to perform
transformations on painting operations. The demo also allows the
examples. Among these is the \l {painting/affine}{Affine
Transformations} example that shows Qt's ability to perform
transformations on painting operations. The example also allows the
user to experiment with the various transformation operations.
*/

4
doc/src/demos/undo.qdoc → doc/src/examples/undo.qdoc
View File

@ -26,10 +26,10 @@
****************************************************************************/
/*!
\example demos/undo
\example tools/undo
\title Undo Framework
This demo shows Qt's undo framework in action.
This example shows Qt's undo framework in action.
\image undodemo.png

6
doc/src/painting-and-printing/coordsys.qdoc
View File

@ -195,8 +195,8 @@
\endtable
You can also twist the coordinate system around the origin using
the QPainter::shear() function. See the \l {demos/affine}{Affine
Transformations} demo for a visualization of a sheared coordinate
the QPainter::shear() function. See the \l {painting/affine}{Affine
Transformations} example for a visualization of a sheared coordinate
system. All the transformation operations operate on QPainter's
transformation matrix that you can retrieve using the
QPainter::worldTransform() function. A matrix transforms a point
@ -285,7 +285,7 @@
For a demonstation of Qt's ability to perform affine
transformations on painting operations, see the \l
{demos/affine}{Affine Transformations} demo which allows the user
{painting/affine}{Affine Transformations} example which allows the user
to experiment with the transformation operations. See also the \l
{painting/transformations}{Transformations} example which shows
how transformations influence the way that QPainter renders

2
doc/src/sql-programming/sql-programming.qdoc
View File

@ -603,7 +603,7 @@
\image qdatawidgetmapper-simple.png
The \l{demos/books}{Books} demonstration shows how information can
The \l{sql/books}{Books} example shows how information can
be presented for easy access by using QDataWidgetMapper and a set of
simple input widgets.
*/

32
examples/animation/README
View File

@ -3,36 +3,6 @@ smooth GUI's. By animating Qt properties, the framework provides great freedom
for animating widgets and other QObjects. The framework can also be used with
the Graphics View framework.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/desktop/README
View File

@ -6,36 +6,5 @@ support for desktop services can be used to improve the appearance of
applications and take advantage of underlying desktop facilities.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/dialogs/README
View File

@ -5,36 +5,5 @@ Custom dialogs can also be created for specialized modal or modeless
interactions with users.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/draganddrop/README
View File

@ -5,36 +5,5 @@ most appropriate formats.
Drag and drop can also be implemented for internal use by applications.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/graphicsview/README
View File

@ -5,36 +5,5 @@ These examples demonstrate the fundamental aspects of canvas programming
with Qt.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

32
examples/ipc/README
View File

@ -1,35 +1,5 @@
These examples demonstrate IPC support in Qt.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/itemviews/README
View File

@ -4,36 +4,5 @@ from the way it is represented to the user, and provides support for
customized rendering through the use of delegates.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

8
examples/itemviews/interview/interview.pro
View File

@ -11,10 +11,10 @@ build_all:!build_pass {
}
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/interview
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/interview
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
INSTALLS += target sources
symbian: CONFIG += qt_demo
QT += widgets widgets
QT += widgets
symbian: CONFIG += qt_example

4
examples/itemviews/itemviews.pro
View File

@ -8,12 +8,14 @@ SUBDIRS = addressbook \
editabletreemodel \
fetchmore \
frozencolumn \
interview \
pixelator \
puzzle \
simpledommodel \
simpletreemodel \
simplewidgetmapper \
spinboxdelegate
spinboxdelegate \
spreadsheet
# install
sources.files = README *.pro

6
examples/itemviews/spreadsheet/spreadsheet.pro
View File

@ -27,9 +27,9 @@ build_all:!build_pass {
}
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/spreadsheet
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/spreadsheet
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
INSTALLS += target sources
symbian: CONFIG += qt_demo
symbian: CONFIG += qt_example

33
examples/layouts/README
View File

@ -6,36 +6,5 @@ Custom layouts can be used to provide more control over the positions and
sizes of child widgets.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/linguist/README
View File

@ -2,36 +2,5 @@ Internationalization is a core feature of Qt. These examples show how to
access translation and localization facilities at run-time.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/mainwindows/README
View File

@ -5,36 +5,5 @@ separate forms of user input are unified in an integrated action system that
also supports keyboard shortcuts and accelerator keys in menu items.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

4
examples/mainwindows/macmainwindow/macmainwindow.pro
View File

@ -16,9 +16,9 @@ LIBS += -framework Cocoa -framework Carbon
# install
mac {
target.path = $$[QT_INSTALL_DEMOS]/qtbase/macmainwindow
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/macmainwindow
sources.files = $$SOURCES *.pro *.html
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/macmainwindow
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/macmainwindow
INSTALLS += target sources
}
QT += widgets widgets

8
examples/mainwindows/mainwindow/mainwindow.pro
View File

@ -9,10 +9,10 @@ build_all:!build_pass {
RESOURCES += mainwindow.qrc
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/mainwindow
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow
sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/mainwindow
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mainwindow
INSTALLS += target sources
symbian: CONFIG += qt_demo
QT += widgets widgets
QT += widgets
symbian: CONFIG += qt_example

3
examples/mainwindows/mainwindows.pro
View File

@ -1,10 +1,13 @@
TEMPLATE = subdirs
SUBDIRS = application \
mainwindow \
mdi \
menus \
recentfiles \
sdi
mac* && !qpa: SUBDIRS += macmainwindow
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README

33
examples/network/README
View File

@ -5,36 +5,5 @@ These examples demonstrate the fundamental aspects of network programming
with Qt.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

28
examples/network/securesocketclient/certificateinfo.cpp
View File

@ -65,8 +65,8 @@ void CertificateInfo::setCertificateChain(const QList<QSslCertificate> &chain)
for (int i = 0; i < chain.size(); ++i) {
const QSslCertificate &cert = chain.at(i);
form->certificationPathView->addItem(tr("%1%2 (%3)").arg(!i ? QString() : tr("Issued by: "))
.arg(cert.subjectInfo(QSslCertificate::Organization))
.arg(cert.subjectInfo(QSslCertificate::CommonName)));
.arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
.arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" "))));
}
form->certificationPathView->setCurrentIndex(0);
@ -78,19 +78,19 @@ void CertificateInfo::updateCertificateInfo(int index)
if (index >= 0 && index < chain.size()) {
const QSslCertificate &cert = chain.at(index);
QStringList lines;
lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization))
<< tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName))
<< tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName))
<< tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName))
<< tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName))
<< tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName))
lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
<< tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" ")))
<< tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName).join(QLatin1String(" ")))
<< tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName).join(QLatin1String(" ")))
<< tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" ")))
<< tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" ")))
<< QString()
<< tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization))
<< tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName))
<< tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName))
<< tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName))
<< tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName))
<< tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName));
<< tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
<< tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" ")))
<< tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName).join(QLatin1String(" ")))
<< tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName).join(QLatin1String(" ")))
<< tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" ")))
<< tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName).join(QLatin1String(" ")));
foreach (QString line, lines)
form->certificateInfoView->addItem(line);
} else {

33
examples/opengl/README
View File

@ -6,36 +6,5 @@ These examples demonstrate the basic techniques used to take advantage of
OpenGL in Qt applications.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/painting/README
View File

@ -7,36 +7,5 @@ with Qt, from basic concepts such as drawing simple primitives to the use of
transformations.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

10
examples/painting/affine/affine.pro
View File

@ -13,12 +13,16 @@ include($$SHARED_FOLDER/shared.pri)
RESOURCES += affine.qrc
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/affine
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/affine
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
INSTALLS += target sources
symbian: CONFIG += qt_demo
symbian {
CONFIG += qt_example
}
maemo5: CONFIG += qt_example
wince*: {
DEPLOYMENT_PLUGIN += qjpeg

6
examples/painting/composition/composition.pro
View File

@ -12,12 +12,12 @@ contains(QT_CONFIG, opengl) {
}
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/composition
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/composition
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
INSTALLS += target sources
symbian: CONFIG += qt_demo
symbian: CONFIG += qt_example
win32-msvc* {
QMAKE_CXXFLAGS += /Zm500

6
examples/painting/deform/deform.pro
View File

@ -13,12 +13,12 @@ contains(QT_CONFIG, opengl) {
}
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/deform
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/deform
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000A63D
CONFIG += qt_demo
CONFIG += qt_example
}

6
examples/painting/gradients/gradients.pro
View File

@ -12,9 +12,9 @@ contains(QT_CONFIG, opengl) {
}
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/gradients
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/gradients
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
INSTALLS += target sources
symbian: CONFIG += qt_demo
symbian: CONFIG += qt_example

21
examples/painting/painting.pro
View File

@ -1,6 +1,12 @@
TEMPLATE = subdirs
SUBDIRS = basicdrawing \
concentriccircles \
examples_affine \
examples_composition \
examples_deform \
examples_gradients \
examples_pathstroke \
painting_shared \
imagecomposition \
painterpaths \
transformations \
@ -15,3 +21,18 @@ INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
examples_affine.subdir = affine
examples_composition.subdir = composition
examples_deform.subdir = deform
examples_gradients.subdir = gradients
examples_pathstroke.subdir = pathstroke
painting_shared.subdir = shared
!ordered {
examples_affine.depends = painting_shared
examples_deform.depends = painting_shared
examples_gradients.depends = painting_shared
examples_composition.depends = painting_shared
examples_pathstroke.depends = painting_shared
}

6
examples/painting/pathstroke/pathstroke.pro
View File

@ -13,12 +13,12 @@ contains(QT_CONFIG, opengl) {
}
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/pathstroke
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/pathstroke
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000A63E
CONFIG += qt_demo
CONFIG += qt_example
}

4
examples/painting/shared/shared.pro
View File

@ -26,9 +26,9 @@ HEADERS += \
RESOURCES += shared.qrc
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/shared
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/shared
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
INSTALLS += sources
!cross_compile:INSTALLS += target

33
examples/qtconcurrent/README
View File

@ -3,36 +3,5 @@ concurrent programming which includes implementations of the well-known
map-reduce and filter-reduce algorithms.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

32
examples/qtestlib/README
View File

@ -4,35 +4,5 @@ in unit testing frameworks as well as extensions for testing graphical
user interfaces.
The examples in this directory should be run from the command line so
that output printed to the console can be examined.
Documentation for these examples can be found via the "Tutorial and Examples"
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/qws/README
View File

@ -3,36 +3,5 @@ for use on systems with limited resources, specialized hardware, and small
screens.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/richtext/README
View File

@ -7,36 +7,5 @@ Text is rendered using anti-aliased outline fonts to provide the best
possible on-screen representation.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

3
examples/richtext/richtext.pro
View File

@ -1,7 +1,8 @@
TEMPLATE = subdirs
SUBDIRS = calendar \
orderform \
syntaxhighlighter
syntaxhighlighter \
textedit
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext

8
examples/richtext/textedit/textedit.pro
View File

@ -14,10 +14,10 @@ build_all:!build_pass {
}
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/textedit
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/textedit
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
INSTALLS += target sources
symbian: CONFIG += qt_demo
QT += widgets widgets
QT += widgets
symbian: CONFIG += qt_example

33
examples/sql/README
View File

@ -5,36 +5,5 @@ SQL support is integrated with Qt's model/view architecture, making it easier
to provide GUI integration for your database applications.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

32
examples/statemachine/README
View File

@ -1,36 +1,6 @@
Qt is provided with a powerful hierchical finite state machine through
the Qt State Machine classes.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/threads/README
View File

@ -5,36 +5,5 @@ mechanism can now be used to communicate between threads.
Additionally, it is now possible to move objects between threads.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/tools/README
View File

@ -5,36 +5,5 @@ Other classes provide application infrastructure support, handling plugin
loading and managing configuration files.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

1
examples/tools/tools.pro
View File

@ -13,6 +13,7 @@ SUBDIRS = codecs \
settingseditor \
styleplugin \
treemodelcompleter \
undo \
undoframework
plugandpaint.depends = plugandpaintplugins

6
examples/tools/undo/undo.pro
View File

@ -10,10 +10,10 @@ build_all:!build_pass {
RESOURCES += undo.qrc
# install
target.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS
sources.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
INSTALLS += target sources
symbian: CONFIG += qt_demo
QT += widgets
symbian: CONFIG += qt_example

35
examples/tutorials/README
View File

@ -1,37 +1,6 @@
Qt is supplied with tutorials that have been written to provide developers
with an introduction to the Qt API.
The example and demo launcher can be used to explore these tutorials, lets
you view the documentation in Qt Assistant, and is able to launch each part
in a series of tutorial programs.
Documentation for tutorials can be found in the Tutorial and Examples section
of the Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.
Documentation for tutorials can be found in the Tutorials
link in the main documentation.

2
examples/webkit/webkit-guide/_index.html
View File

@ -94,7 +94,6 @@ a[href^='http://waplabdc.nokia-boston.com']:before { content: url(http://waplabd
<ul>
<li><a href="all-examples.html">Examples</a></li>
<li><a href="tutorials.html">Tutorials</a></li>
<li><a href="demos.html">Demos</a></li>
<li><a href="qdeclarativeexamples.html">QML Examples</a></li>
</ul>
</li>
@ -159,7 +158,6 @@ a[href^='http://waplabdc.nokia-boston.com']:before { content: url(http://waplabd
<ul id="ul003">
<li class="defaultLink"><a href="all-examples.html">Examples</a></li>
<li class="defaultLink"><a href="tutorials.html">Tutorials</a></li>
<li class="defaultLink"><a href="demos.html">Demos</a></li>
<li class="defaultLink"><a href="qdeclarativeexamples.html">QML Examples</a></li>
</ul>
</div>

33
examples/widgets/README
View File

@ -9,36 +9,5 @@ be used to change the appearance of standard widgets and appropriately
written custom widgets.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

33
examples/xml/README
View File

@ -5,36 +5,5 @@ classes enable more complex document-level operations to be performed on
XML files.
The example launcher provided with Qt can be used to explore each of the
examples in this directory.
Documentation for these examples can be found via the Tutorial and Examples
Documentation for these examples can be found via the Examples
link in the main Qt documentation.
Finding the Qt Examples and Demos launcher
==========================================
On Windows:
The launcher can be accessed via the Windows Start menu. Select the menu
entry entitled "Qt Examples and Demos" entry in the submenu containing
the Qt tools.
On Mac OS X:
For the binary distribution, the qtdemo executable is installed in the
/Developer/Applications/Qt directory. For the source distribution, it is
installed alongside the other Qt tools on the path specified when Qt is
configured.
On Unix/Linux:
The qtdemo executable is installed alongside the other Qt tools on the path
specified when Qt is configured.
On all platforms:
The source code for the launcher can be found in the demos/qtdemo directory
in the Qt package. This example is built at the same time as the Qt libraries,
tools, examples, and demonstrations.

7
mkspecs/modules/qt_core.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_core.pri)

7
mkspecs/modules/qt_dbus.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_dbus.pri)

7
mkspecs/modules/qt_gui.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_gui.pri)

7
mkspecs/modules/qt_network.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_network.pri)

7
mkspecs/modules/qt_opengl.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_opengl.pri)

7
mkspecs/modules/qt_platformsupport.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_platformsupport.pri)

7
mkspecs/modules/qt_sql.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_sql.pri)

7
mkspecs/modules/qt_testlib.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_testlib.pri)

7
mkspecs/modules/qt_uilib.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_uilib.pri)

7
mkspecs/modules/qt_uitools.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_uitools.pri)

7
mkspecs/modules/qt_widgets.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_widgets.pri)

7
mkspecs/modules/qt_xml.pri Normal file
View File

@ -0,0 +1,7 @@
QT_MODULE_BASE = /home/laknoll/dev/qt/base
QT_MODULE_BIN_BASE = /home/laknoll/dev/qt/base/bin
QT_MODULE_INCLUDE_BASE = /home/laknoll/dev/qt/base/include
QT_MODULE_IMPORT_BASE = /home/laknoll/dev/qt/base/imports
QT_MODULE_LIB_BASE = /home/laknoll/dev/qt/base/lib
QT_MODULE_PLUGIN_BASE = /home/laknoll/dev/qt/base/plugins
include(/home/laknoll/dev/qt/base/src/modules/qt_xml.pri)

26
mkspecs/qmodule.pri Normal file
View File

@ -0,0 +1,26 @@
QMAKE_LFLAGS = -Wl,-rpath-link,$$QT_BUILD_TREE/lib $$QMAKE_LFLAGS
QT_LFLAGS_ODBC = -lodbc
styles += cde mac motif plastique cleanlooks windows
decorations += default windows styled
mouse-drivers += pc
gfx-drivers += linuxfb
mouse-drivers += linuxtp
kbd-drivers += tty
kbd-drivers += um
QT_CFLAGS_DBUS = -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
QT_LIBS_DBUS = -L/lib -ldbus-1 -lpthread -lrt
QT_CFLAGS_GLIB = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
QT_LIBS_GLIB = -pthread -lgthread-2.0 -lrt -lglib-2.0
QT_CFLAGS_GSTREAMER = -pthread -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2
QT_LIBS_GSTREAMER = -pthread -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lrt -lglib-2.0
QMAKE_CFLAGS_FONTCONFIG = -I/usr/include/freetype2
QMAKE_LIBS_FONTCONFIG = -lfontconfig -lfreetype
DEFINES += QT_NO_CORESERVICES
PRECOMPILED_DIR = .pch/debug-shared
OBJECTS_DIR = .obj/debug-shared
MOC_DIR = .moc/debug-shared
RCC_DIR = .rcc/debug-shared
UI_DIR = .uic/debug-shared
QMAKE_RPATHDIR += "/home/laknoll/dev/qt/base/lib"
sql-drivers =
sql-plugins = sqlite

2
mkspecs/win32-msvc2005/qmake.conf
View File

@ -16,7 +16,7 @@ QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
QMAKE_YACCFLAGS = -d
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t
QMAKE_CFLAGS_WARN_ON = -W3
QMAKE_CFLAGS_WARN_OFF = -W0
QMAKE_CFLAGS_RELEASE = -O2 -MD

2
mkspecs/win32-msvc2008/qmake.conf
View File

@ -16,7 +16,7 @@ QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
QMAKE_YACCFLAGS = -d
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t
QMAKE_CFLAGS_WARN_ON = -W3
QMAKE_CFLAGS_WARN_OFF = -W0
QMAKE_CFLAGS_RELEASE = -O2 -MD

2
mkspecs/win32-msvc2010/qmake.conf
View File

@ -16,7 +16,7 @@ QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
QMAKE_YACCFLAGS = -d
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t
QMAKE_CFLAGS_WARN_ON = -W3
QMAKE_CFLAGS_WARN_OFF = -W0
QMAKE_CFLAGS_RELEASE = -O2 -MD

58
src/corelib/codecs/qtextcodec.cpp
View File

@ -1427,48 +1427,6 @@ bool QTextCodec::canEncode(const QString& s) const
return (state.invalidChars == 0);
}
#ifdef QT3_SUPPORT
/*!
Returns a string representing the current language and
sublanguage, e.g. "pt" for Portuguese, or "pt_br" for Portuguese/Brazil.
\sa QLocale
*/
const char *QTextCodec::locale()
{
static char locale[6];
QByteArray l = QLocale::system().name().toLatin1();
int len = qMin(l.length(), 5);
memcpy(locale, l.constData(), len);
locale[len] = '\0';
return locale;
}
/*!
\overload
*/
QByteArray QTextCodec::fromUnicode(const QString& uc, int& lenInOut) const
{
QByteArray result = convertFromUnicode(uc.constData(), lenInOut, 0);
lenInOut = result.length();
return result;
}
/*!
\overload
\a a contains the source characters; \a len contains the number of
characters in \a a to use.
*/
QString QTextCodec::toUnicode(const QByteArray& a, int len) const
{
len = qMin(a.size(), len);
return convertToUnicode(a.constData(), len, 0);
}
#endif
/*!
\overload
@ -1552,22 +1510,6 @@ QByteArray QTextEncoder::fromUnicode(const QChar *uc, int len)
return result;
}
#ifdef QT3_SUPPORT
/*!
\overload
Converts \a lenInOut characters (not bytes) from \a uc, and returns the
result in a QByteArray. The number of characters read is returned in
the \a lenInOut parameter.
*/
QByteArray QTextEncoder::fromUnicode(const QString& uc, int& lenInOut)
{
QByteArray result = c->fromUnicode(uc.constData(), lenInOut, &state);
lenInOut = result.length();
return result;
}
#endif
/*!
\class QTextDecoder
\brief The QTextDecoder class provides a state-based decoder.

14
src/corelib/codecs/qtextcodec.h
View File

@ -134,17 +134,6 @@ protected:
QTextCodec();
virtual ~QTextCodec();
public:
#ifdef QT3_SUPPORT
static QT3_SUPPORT QTextCodec* codecForContent(const char*, int) { return 0; }
static QT3_SUPPORT const char* locale();
static QT3_SUPPORT QTextCodec* codecForName(const char* hint, int) { return codecForName(QByteArray(hint)); }
QT3_SUPPORT QByteArray fromUnicode(const QString& uc, int& lenInOut) const;
QT3_SUPPORT QString toUnicode(const QByteArray&, int len) const;
QT3_SUPPORT QByteArray mimeName() const { return name(); }
static QT3_SUPPORT QTextCodec *codecForIndex(int i) { return codecForName(availableCodecs().value(i)); }
#endif
private:
friend class QTextCodecCleanup;
static QTextCodec *cftr;
@ -165,9 +154,6 @@ public:
~QTextEncoder();
QByteArray fromUnicode(const QString& str);
QByteArray fromUnicode(const QChar *uc, int len);
#ifdef QT3_SUPPORT
QT3_SUPPORT QByteArray fromUnicode(const QString& uc, int& lenInOut);
#endif
bool hasFailure() const;
private:
const QTextCodec *c;

53
src/corelib/global/qglobal.cpp
View File

@ -2471,11 +2471,6 @@ void qCritical(const char *msg, ...)
va_end(ap);
}
#ifdef QT3_SUPPORT
void qSystemWarning(const char *msg, int code)
{ qCritical("%s (%s)", msg, qt_error_string(code).toLocal8Bit().constData()); }
#endif // QT3_SUPPORT
void qErrnoWarning(const char *msg, ...)
{
// qt_error_string() will allocate anyway, so we don't have
@ -3031,54 +3026,6 @@ int qrand()
with meaningful parameter names in their signatures.
*/
#if defined(QT3_SUPPORT) && !defined(QT_NO_SETTINGS)
QT_BEGIN_INCLUDE_NAMESPACE
#include <qlibraryinfo.h>
QT_END_INCLUDE_NAMESPACE
static const char *qInstallLocation(QLibraryInfo::LibraryLocation loc)
{
static QByteArray ret;
ret = QLibraryInfo::location(loc).toLatin1();
return ret.constData();
}
const char *qInstallPath()
{
return qInstallLocation(QLibraryInfo::PrefixPath);
}
const char *qInstallPathDocs()
{
return qInstallLocation(QLibraryInfo::DocumentationPath);
}
const char *qInstallPathHeaders()
{
return qInstallLocation(QLibraryInfo::HeadersPath);
}
const char *qInstallPathLibs()
{
return qInstallLocation(QLibraryInfo::LibrariesPath);
}
const char *qInstallPathBins()
{
return qInstallLocation(QLibraryInfo::BinariesPath);
}
const char *qInstallPathPlugins()
{
return qInstallLocation(QLibraryInfo::PluginsPath);
}
const char *qInstallPathData()
{
return qInstallLocation(QLibraryInfo::DataPath);
}
const char *qInstallPathTranslations()
{
return qInstallLocation(QLibraryInfo::TranslationsPath);
}
const char *qInstallPathSysconf()
{
return qInstallLocation(QLibraryInfo::SettingsPath);
}
#endif
struct QInternal_CallBackTable {
QVector<QList<qInternalCallback> > callbacks;

122
src/corelib/global/qglobal.h
View File

@ -1031,18 +1031,10 @@ redefine to built-in booleans to make autotests work properly */
#endif
#if defined(QT_NO_DEPRECATED)
/* disable Qt3 support as well */
# undef QT3_SUPPORT_WARNINGS
# undef QT3_SUPPORT
# undef QT_DEPRECATED
# undef QT_DEPRECATED_VARIABLE
# undef QT_DEPRECATED_CONSTRUCTOR
#elif defined(QT_DEPRECATED_WARNINGS)
# ifdef QT3_SUPPORT
/* enable Qt3 support warnings as well */
# undef QT3_SUPPORT_WARNINGS
# define QT3_SUPPORT_WARNINGS
# endif
# undef QT_DEPRECATED
# define QT_DEPRECATED Q_DECL_DEPRECATED
# undef QT_DEPRECATED_VARIABLE
@ -1058,28 +1050,6 @@ redefine to built-in booleans to make autotests work properly */
# define QT_DEPRECATED_CONSTRUCTOR
#endif
#if defined(QT3_SUPPORT_WARNINGS)
# if !defined(QT_COMPAT_WARNINGS) /* also enable compat */
# define QT_COMPAT_WARNINGS
# endif
# undef QT3_SUPPORT
# define QT3_SUPPORT Q_DECL_DEPRECATED
# undef QT3_SUPPORT_VARIABLE
# define QT3_SUPPORT_VARIABLE Q_DECL_VARIABLE_DEPRECATED
# undef QT3_SUPPORT_CONSTRUCTOR
# define QT3_SUPPORT_CONSTRUCTOR explicit Q_DECL_CONSTRUCTOR_DEPRECATED
#elif defined(QT3_SUPPORT) /* define back to nothing */
# if !defined(QT_COMPAT) /* also enable qt3 support */
# define QT_COMPAT
# endif
# undef QT3_SUPPORT
# define QT3_SUPPORT
# undef QT3_SUPPORT_VARIABLE
# define QT3_SUPPORT_VARIABLE
# undef QT3_SUPPORT_CONSTRUCTOR
# define QT3_SUPPORT_CONSTRUCTOR explicit
#endif
/* moc compats (signals/slots) */
#ifndef QT_MOC_COMPAT
# if defined(QT3_SUPPORT)
@ -1173,31 +1143,6 @@ template <typename T>
inline const T &qBound(const T &min, const T &val, const T &max)
{ return qMax(min, qMin(max, val)); }
#ifdef QT3_SUPPORT
typedef qint8 Q_INT8;
typedef quint8 Q_UINT8;
typedef qint16 Q_INT16;
typedef quint16 Q_UINT16;
typedef qint32 Q_INT32;
typedef quint32 Q_UINT32;
typedef qint64 Q_INT64;
typedef quint64 Q_UINT64;
typedef qint64 Q_LLONG;
typedef quint64 Q_ULLONG;
#if defined(Q_OS_WIN64)
typedef __int64 Q_LONG; /* word up to 64 bit signed */
typedef unsigned __int64 Q_ULONG; /* word up to 64 bit unsigned */
#else
typedef long Q_LONG; /* word up to 64 bit signed */
typedef unsigned long Q_ULONG; /* word up to 64 bit unsigned */
#endif
# define QABS(a) qAbs(a)
# define QMAX(a, b) qMax((a), (b))
# define QMIN(a, b) qMin((a), (b))
#endif
/*
Data stream functions are provided by many classes (defined in qdatastream.h)
*/
@ -1659,27 +1604,6 @@ Q_CORE_EXPORT bool qSharedBuild();
inline int qMacVersion() { return QSysInfo::MacintoshVersion; }
#endif
#ifdef QT3_SUPPORT
inline QT3_SUPPORT bool qSysInfo(int *wordSize, bool *bigEndian)
{
*wordSize = QSysInfo::WordSize;
*bigEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian);
return true;
}
#endif
#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
#if defined(QT3_SUPPORT)
inline QT3_SUPPORT bool qt_winUnicode() { return true; }
inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; }
#endif
// ### Qt 5: remove Win9x support macros QT_WA and QT_WA_INLINE.
#define QT_WA(unicode, ansi) unicode
#define QT_WA_INLINE(unicode, ansi) (unicode)
#endif /* Q_OS_WIN */
#ifndef Q_OUTOFLINE_TEMPLATE
# define Q_OUTOFLINE_TEMPLATE
#endif
@ -1749,9 +1673,6 @@ Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */
#endif
;
#ifdef QT3_SUPPORT
Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
#endif /* QT3_SUPPORT */
Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
@ -1853,11 +1774,6 @@ Q_CORE_EXPORT void qt_message_output(QtMsgType, const char *buf);
typedef void (*QtMsgHandler)(QtMsgType, const char *);
Q_CORE_EXPORT QtMsgHandler qInstallMsgHandler(QtMsgHandler);
#ifdef QT3_SUPPORT
inline QT3_SUPPORT void qSuppressObsoleteWarnings(bool = true) {}
inline QT3_SUPPORT void qObsolete(const char *, const char * = 0, const char * = 0) {}
#endif
#if !defined(Q_UNIMPLEMENTED)
# define Q_UNIMPLEMENTED() qWarning("%s:%d: %s: Unimplemented code.", __FILE__, __LINE__, Q_FUNC_INFO)
#endif
@ -2491,9 +2407,15 @@ Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1);
classes contains a private copy constructor and assignment
operator to disable copying (the compiler gives an error message).
*/
#ifdef Q_COMPILER_DEFAULT_DELETE_MEMBERS
#define Q_DISABLE_COPY(Class) \
Class(const Class &) = delete;\
Class &operator=(const Class &) = delete;
#else
#define Q_DISABLE_COPY(Class) \
Class(const Class &); \
Class &operator=(const Class &);
#endif
class QByteArray;
Q_CORE_EXPORT QByteArray qgetenv(const char *varName);
@ -2508,27 +2430,6 @@ inline int qIntCast(float f) { return int(f); }
Q_CORE_EXPORT void qsrand(uint seed);
Q_CORE_EXPORT int qrand();
/*
Compat functions that were generated by configure
*/
#ifdef QT3_SUPPORT
#ifndef QT_PRODUCT_LICENSEE
# define QT_PRODUCT_LICENSEE QLibraryInfo::licensee()
#endif
#ifndef QT_PRODUCT_LICENSE
# define QT_PRODUCT_LICENSE QLibraryInfo::licensedProducts()
#endif
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPath();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathDocs();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathHeaders();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathLibs();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathBins();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathPlugins();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathData();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathTranslations();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
#endif
#if defined(Q_OS_SYMBIAN)
#ifdef SYMBIAN_BUILD_GCE
@ -2612,8 +2513,6 @@ Q_CORE_EXPORT int qt_symbian_exception2Error(const std::exception& ex);
#define QT_MODULE_OPENGL 0x000008
#define QT_MODULE_SQL 0x000010
#define QT_MODULE_XML 0x000020
#define QT_MODULE_QT3SUPPORTLIGHT 0x000040
#define QT_MODULE_QT3SUPPORT 0x000080
#define QT_MODULE_SVG 0x000100
#define QT_MODULE_ACTIVEQT 0x000200
#define QT_MODULE_GRAPHICSVIEW 0x000400
@ -2641,7 +2540,6 @@ Q_CORE_EXPORT int qt_symbian_exception2Error(const std::exception& ex);
| QT_MODULE_DBUS)
#define QT_EDITION_DESKTOPLIGHT (QT_MODULE_CORE \
| QT_MODULE_GUI \
| QT_MODULE_QT3SUPPORTLIGHT \
| QT_MODULE_TEST \
| QT_MODULE_DBUS)
#define QT_EDITION_OPENSOURCE (QT_MODULE_CORE \
@ -2655,8 +2553,6 @@ Q_CORE_EXPORT int qt_symbian_exception2Error(const std::exception& ex);
| QT_MODULE_XMLPATTERNS \
| QT_MODULE_SCRIPT \
| QT_MODULE_SCRIPTTOOLS \
| QT_MODULE_QT3SUPPORTLIGHT \
| QT_MODULE_QT3SUPPORT \
| QT_MODULE_SVG \
| QT_MODULE_DECLARATIVE \
| QT_MODULE_GRAPHICSVIEW \
@ -2723,12 +2619,6 @@ QT_LICENSED_MODULE(Script)
#if (QT_EDITION & QT_MODULE_SCRIPTTOOLS)
QT_LICENSED_MODULE(ScriptTools)
#endif
#if (QT_EDITION & QT_MODULE_QT3SUPPORTLIGHT)
QT_LICENSED_MODULE(Qt3SupportLight)
#endif
#if (QT_EDITION & QT_MODULE_QT3SUPPORT)
QT_LICENSED_MODULE(Qt3Support)
#endif
#if (QT_EDITION & QT_MODULE_SVG)
QT_LICENSED_MODULE(Svg)
#endif

258
src/corelib/global/qnamespace.h
View File

@ -66,7 +66,6 @@ Qt {
Q_ENUMS(ScrollBarPolicy FocusPolicy ContextMenuPolicy)
Q_ENUMS(ArrowType ToolButtonStyle PenStyle PenCapStyle PenJoinStyle BrushStyle)
Q_ENUMS(FillRule MaskMode BGMode ClipOperation SizeMode)
Q_ENUMS(BackgroundMode) // Qt3
Q_ENUMS(Axis Corner LayoutDirection SizeHint Orientation DropAction)
Q_FLAGS(Alignment Orientations DropActions)
Q_FLAGS(DockWidgetAreas ToolBarAreas)
@ -159,18 +158,6 @@ public:
};
Q_DECLARE_FLAGS(MouseButtons, MouseButton)
#ifdef QT3_SUPPORT
enum ButtonState_enum {
ShiftButton = Qt::ShiftModifier,
ControlButton = Qt::ControlModifier,
AltButton = Qt::AltModifier,
MetaButton = Qt::MetaModifier,
Keypad = Qt::KeypadModifier,
KeyButtonMask = Qt::KeyboardModifierMask
};
typedef int ButtonState;
#endif
enum Orientation {
Horizontal = 0x1,
Vertical = 0x2
@ -189,10 +176,6 @@ public:
enum SortOrder {
AscendingOrder,
DescendingOrder
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
,Ascending = AscendingOrder,
Descending = DescendingOrder
#endif
};
enum TileRule {
@ -221,9 +204,6 @@ public:
AlignVertical_Mask = AlignTop | AlignBottom | AlignVCenter,
AlignCenter = AlignVCenter | AlignHCenter
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
, AlignAuto = AlignLeft
#endif
};
Q_DECLARE_FLAGS(Alignment, AlignmentFlag)
@ -243,22 +223,7 @@ public:
TextForceRightToLeft = 0x40000,
TextLongestVariant = 0x80000,
TextBypassShaping = 0x100000
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
,SingleLine = TextSingleLine,
DontClip = TextDontClip,
ExpandTabs = TextExpandTabs,
ShowPrefix = TextShowMnemonic,
WordBreak = TextWordWrap,
BreakAnywhere = TextWrapAnywhere,
DontPrint = TextDontPrint,
IncludeTrailingSpaces = TextIncludeTrailingSpaces,
NoAccel = TextHideMnemonic
#endif
};
#ifdef QT3_SUPPORT
typedef TextFlag TextFlags;
#endif
enum TextElideMode {
ElideLeft,
@ -533,36 +498,11 @@ public:
OpaqueMode
};
#ifdef QT3_SUPPORT
enum PaintUnit { // paint unit
PixelUnit,
LoMetricUnit, // obsolete
HiMetricUnit, // obsolete
LoEnglishUnit, // obsolete
HiEnglishUnit, // obsolete
TwipsUnit // obsolete
};
enum GUIStyle {
MacStyle,
WindowsStyle,
Win3Style,
PMStyle,
MotifStyle
};
#endif
enum Key {
Key_Escape = 0x01000000, // misc keys
Key_Tab = 0x01000001,
Key_Backtab = 0x01000002,
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
Key_BackTab = Key_Backtab,
#endif
Key_Backspace = 0x01000003,
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
Key_BackSpace = Key_Backspace,
#endif
Key_Return = 0x01000004,
Key_Enter = 0x01000005,
Key_Insert = 0x01000006,
@ -578,13 +518,7 @@ public:
Key_Right = 0x01000014,
Key_Down = 0x01000015,
Key_PageUp = 0x01000016,
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
Key_Prior = Key_PageUp,
#endif
Key_PageDown = 0x01000017,
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
Key_Next = Key_PageDown,
#endif
Key_Shift = 0x01000020, // modifiers
Key_Control = 0x01000021,
Key_Meta = 0x01000022,
@ -770,41 +704,7 @@ public:
Key_Yacute = 0x0dd,
Key_THORN = 0x0de,
Key_ssharp = 0x0df,
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
Key_agrave = Key_Agrave,
Key_aacute = Key_Aacute,
Key_acircumflex = Key_Acircumflex,
Key_atilde = Key_Atilde,
Key_adiaeresis = Key_Adiaeresis,
Key_aring = Key_Aring,
Key_ae = Key_AE,
Key_ccedilla = Key_Ccedilla,
Key_egrave = Key_Egrave,
Key_eacute = Key_Eacute,
Key_ecircumflex = Key_Ecircumflex,
Key_ediaeresis = Key_Ediaeresis,
Key_igrave = Key_Igrave,
Key_iacute = Key_Iacute,
Key_icircumflex = Key_Icircumflex,
Key_idiaeresis = Key_Idiaeresis,
Key_eth = Key_ETH,
Key_ntilde = Key_Ntilde,
Key_ograve = Key_Ograve,
Key_oacute = Key_Oacute,
Key_ocircumflex = Key_Ocircumflex,
Key_otilde = Key_Otilde,
Key_odiaeresis = Key_Odiaeresis,
#endif
Key_division = 0x0f7,
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
Key_oslash = Key_Ooblique,
Key_ugrave = Key_Ugrave,
Key_uacute = Key_Uacute,
Key_ucircumflex = Key_Ucircumflex,
Key_udiaeresis = Key_Udiaeresis,
Key_yacute = Key_Yacute,
Key_thorn = Key_THORN,
#endif
Key_ydiaeresis = 0x0ff,
// International input method support (X keycode - 0xEE00, the
@ -904,9 +804,6 @@ public:
Key_MediaPlay = 0x01000080,
Key_MediaStop = 0x01000081,
Key_MediaPrevious = 0x01000082,
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
Key_MediaPrev = Key_MediaPrevious,
#endif
Key_MediaNext = 0x01000083,
Key_MediaRecord = 0x01000084,
Key_MediaPause = 0x1000085,
@ -1122,9 +1019,6 @@ public:
RadialGradientPattern,
ConicalGradientPattern,
TexturePattern = 24
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
, CustomPattern = TexturePattern
#endif
};
enum SizeMode {
@ -1132,66 +1026,6 @@ public:
RelativeSize
};
#if defined(QT3_SUPPORT)
#if defined(Q_OS_MAC)
#ifndef qdoc
typedef int MacintoshVersion;
enum
#else
enum MacintoshVersion
#endif
{
//Unknown
MV_Unknown = 0x0000,
//Version numbers
MV_9 = QSysInfo::MV_9,
MV_10_DOT_0 = QSysInfo::MV_10_0,
MV_10_DOT_1 = QSysInfo::MV_10_1,
MV_10_DOT_2 = QSysInfo::MV_10_2,
MV_10_DOT_3 = QSysInfo::MV_10_3,
MV_10_DOT_4 = QSysInfo::MV_10_4,
//Code names
MV_CHEETAH = QSysInfo::MV_CHEETAH,
MV_PUMA = QSysInfo::MV_PUMA,
MV_JAGUAR = QSysInfo::MV_JAGUAR,
MV_PANTHER = QSysInfo::MV_PANTHER,
MV_TIGER = QSysInfo::MV_TIGER
};
#endif // Q_OS_MAC
#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
#ifndef qdoc
typedef int WindowsVersion;
enum
#else
enum WindowsVersion
#endif
{
WV_32s = QSysInfo::WV_32s,
WV_95 = QSysInfo::WV_95,
WV_98 = QSysInfo::WV_98,
WV_Me = QSysInfo::WV_Me,
WV_DOS_based= QSysInfo::WV_DOS_based,
WV_NT = QSysInfo::WV_NT,
WV_2000 = QSysInfo::WV_2000,
WV_XP = QSysInfo::WV_XP,
WV_2003 = QSysInfo::WV_2003,
WV_NT_based = QSysInfo::WV_NT_based,
WV_CE = QSysInfo::WV_CE,
WV_CENET = QSysInfo::WV_CENET,
WV_CE_5 = QSysInfo::WV_CE_5,
WV_CE_6 = QSysInfo::WV_CE_6,
WV_CE_based = QSysInfo::WV_CE_based
};
#endif // Q_OS_WIN
#endif // QT3_SUPPORT
enum UIEffect {
UI_General,
UI_AnimateMenu,
@ -1228,26 +1062,6 @@ public:
LastCursor = DragLinkCursor,
BitmapCursor = 24,
CustomCursor = 25
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
,
arrowCursor = ArrowCursor,
upArrowCursor = UpArrowCursor,
crossCursor = CrossCursor,
waitCursor = WaitCursor,
ibeamCursor = IBeamCursor,
sizeVerCursor = SizeVerCursor,
sizeHorCursor = SizeHorCursor,
sizeBDiagCursor = SizeBDiagCursor,
sizeFDiagCursor = SizeFDiagCursor,
sizeAllCursor = SizeAllCursor,
blankCursor = BlankCursor,
splitVCursor = SplitVCursor,
splitHCursor = SplitHCursor,
pointingHandCursor = PointingHandCursor,
forbiddenCursor = ForbiddenCursor,
whatsThisCursor = WhatsThisCursor
#endif
};
enum TextFormat {
@ -1261,15 +1075,7 @@ public:
IgnoreAspectRatio,
KeepAspectRatio,
KeepAspectRatioByExpanding
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
, ScaleFree = IgnoreAspectRatio,
ScaleMin = KeepAspectRatio,
ScaleMax = KeepAspectRatioByExpanding
#endif
};
#ifdef QT3_SUPPORT
typedef AspectRatioMode ScaleMode;
#endif
// This is for Q3TextEdit only, actually.
enum AnchorAttribute {
@ -1310,28 +1116,6 @@ public:
Q_DECLARE_FLAGS(ToolBarAreas, ToolBarArea)
#ifdef QT3_SUPPORT
enum Dock {
DockUnmanaged,
DockTornOff,
DockTop,
DockBottom,
DockRight,
DockLeft,
DockMinimized
,
Unmanaged = DockUnmanaged,
TornOff = DockTornOff,
Top = DockTop,
Bottom = DockBottom,
Right = DockRight,
Left = DockLeft,
Minimized = DockMinimized
};
// compatibility
typedef Dock ToolBarDock;
#endif
enum DateFormat {
TextDate, // default Qt
ISODate, // ISO 8601
@ -1366,31 +1150,6 @@ public:
ScrollBarAlwaysOn
};
#ifdef QT3_SUPPORT
enum BackgroundMode {
FixedColor,
FixedPixmap,
NoBackground,
PaletteForeground,
PaletteButton,
PaletteLight,
PaletteMidlight,
PaletteDark,
PaletteMid,
PaletteText,
PaletteBrightText,
PaletteBase,
PaletteBackground,
PaletteShadow,
PaletteHighlight,
PaletteHighlightedText,
PaletteButtonText,
PaletteLink,
PaletteLinkVisited,
X11ParentRelative
};
#endif
enum CaseSensitivity {
CaseInsensitive,
CaseSensitive
@ -1401,12 +1160,6 @@ public:
TopRightCorner = 0x00001,
BottomLeftCorner = 0x00002,
BottomRightCorner = 0x00003
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
,TopLeft = TopLeftCorner,
TopRight = TopRightCorner,
BottomLeft = BottomLeftCorner,
BottomRight = BottomRightCorner
#endif
};
enum ConnectionType {
@ -1438,8 +1191,7 @@ public:
enum ClipOperation {
NoClip,
ReplaceClip,
IntersectClip,
UniteClip
IntersectClip
};
// Shape = 0x1, BoundingRect = 0x2
@ -1818,14 +1570,6 @@ public:
static bool callFunction(InternalFunction func, void **);
};
#ifdef QT3_SUPPORT
typedef qint32 QCOORD; // coordinate type
enum {
QCOORD_MAX = 2147483647,
QCOORD_MIN = -QCOORD_MAX - 1
};
#endif
QT_END_NAMESPACE
QT_END_HEADER

46
src/corelib/global/qnamespace.qdoc
View File

@ -2201,52 +2201,6 @@
TargetMoveAction is not used on the Mac.
*/
#if defined(Q_OS_WIN) && defined(QT3_SUPPORT)
/*!
\enum Qt::WindowsVersion
\compat
\value WV_32s
\value WV_95
\value WV_98
\value WV_Me
\value WV_DOS_based
\value WV_NT
\value WV_2000
\value WV_XP
\value WV_2003
\value WV_NT_based
\value WV_CE
\value WV_CENET
\value WV_CE_based
\value WV_CE_5
\value WV_CE_6
*/
#endif
#if defined(Q_OS_MAC) && defined(QT3_SUPPORT)
/*!
\enum Qt::MacintoshVersion
\compat
\value MV_Unknown Use QSysInfo::MV_Unknown instead.
\value MV_9 Use QSysInfo::MV_9 instead.
\value MV_10_DOT_0 Use QSysInfo::MV_10_0 instead.
\value MV_10_DOT_1 Use QSysInfo::MV_10_1 instead.
\value MV_10_DOT_2 Use QSysInfo::MV_10_2 instead.
\value MV_10_DOT_3 Use QSysInfo::MV_10_3 instead.
\value MV_10_DOT_4 Use QSysInfo::MV_10_4 instead.
\value MV_CHEETAH Use QSysInfo::MV_10_0 instead.
\value MV_PUMA Use QSysInfo::MV_10_1 instead.
\value MV_JAGUAR Use QSysInfo::MV_10_2 instead.
\value MV_PANTHER Use QSysInfo::MV_10_3 instead.
\value MV_TIGER Use QSysInfo::MV_10_4 instead.
\sa QSysInfo::MacVersion
*/
#endif
/*! \typedef Qt::ToolBarDock
\compat

41
src/corelib/io/qdatastream.cpp
View File

@ -294,31 +294,6 @@ QDataStream::QDataStream(QIODevice *d)
q_status = Ok;
}
#ifdef QT3_SUPPORT
/*!
\fn QDataStream::QDataStream(QByteArray *array, int mode)
\compat
Constructs a data stream that operates on the given \a array. The
\a mode specifies how the byte array is to be used, and is
usually either QIODevice::ReadOnly or QIODevice::WriteOnly.
*/
QDataStream::QDataStream(QByteArray *a, int mode)
{
QBuffer *buf = new QBuffer(a);
#ifndef QT_NO_QOBJECT
buf->blockSignals(true);
#endif
buf->open(QIODevice::OpenMode(mode));
dev = buf;
owndev = true;
byteorder = BigEndian;
ver = DefaultStreamVersion;
noswap = QSysInfo::ByteOrder == QSysInfo::BigEndian;
q_status = Ok;
}
#endif
/*!
\fn QDataStream::QDataStream(QByteArray *a, QIODevice::OpenMode mode)
@ -587,6 +562,8 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_4_6 Version 12 (Qt 4.6, Qt 4.7, Qt 4.8)
\value Qt_4_7 Same as Qt_4_6.
\value Qt_4_8 Same as Qt_4_6.
\value Qt_4_9 Same as Qt_4_6.
\value Qt_5_0 Same as Qt_4_6.
\sa setVersion(), version()
*/
@ -1307,20 +1284,6 @@ int QDataStream::skipRawData(int len)
}
}
#ifdef QT3_SUPPORT
/*!
\fn QDataStream &QDataStream::readRawBytes(char *str, uint len)
Use readRawData() instead.
*/
/*!
\fn QDataStream &QDataStream::writeRawBytes(const char *str, uint len)
Use writeRawData() instead.
*/
#endif
QT_END_NAMESPACE
#endif // QT_NO_DATASTREAM

15
src/corelib/io/qdatastream.h
View File

@ -113,9 +113,6 @@ public:
QDataStream();
explicit QDataStream(QIODevice *);
#ifdef QT3_SUPPORT
QDataStream(QByteArray *, int mode);
#endif
QDataStream(QByteArray *, QIODevice::OpenMode flags);
QDataStream(const QByteArray &);
virtual ~QDataStream();
@ -125,9 +122,6 @@ public:
void unsetDevice();
bool atEnd() const;
#ifdef QT3_SUPPORT
inline QT3_SUPPORT bool eof() const { return atEnd(); }
#endif
Status status() const;
void setStatus(Status status);
@ -177,15 +171,6 @@ public:
int skipRawData(int len);
#ifdef QT3_SUPPORT
inline QT3_SUPPORT QDataStream &readRawBytes(char *str, uint len)
{ readRawData(str, static_cast<int>(len)); return *this; }
inline QT3_SUPPORT QDataStream &writeRawBytes(const char *str, uint len)
{ writeRawData(str, static_cast<int>(len)); return *this; }
inline QT3_SUPPORT bool isPrintableData() const { return false; }
inline QT3_SUPPORT void setPrintableData(bool) {}
#endif
private:
Q_DISABLE_COPY(QDataStream)

155
src/corelib/io/qdir.cpp
View File

@ -91,10 +91,6 @@ QDirPrivate::QDirPrivate(const QString &path, const QStringList &nameFilters_, Q
, nameFilters(nameFilters_)
, sort(sort_)
, filters(filters_)
#ifdef QT3_SUPPORT
, filterSepChar(0)
, matchAllDirs(false)
#endif
, fileListsInitialized(false)
{
setPath(path.isEmpty() ? QString::fromLatin1(".") : path);
@ -118,10 +114,6 @@ QDirPrivate::QDirPrivate(const QDirPrivate &copy)
, nameFilters(copy.nameFilters)
, sort(copy.sort)
, filters(copy.filters)
#ifdef QT3_SUPPORT
, filterSepChar(copy.filterSepChar)
, matchAllDirs(copy.matchAllDirs)
#endif
, fileListsInitialized(false)
, dirEntry(copy.dirEntry)
, metaData(copy.metaData)
@ -1288,10 +1280,6 @@ QStringList QDir::entryList(const QStringList &nameFilters, Filters filters,
if (filters == NoFilter)
filters = d->filters;
#ifdef QT3_SUPPORT
if (d->matchAllDirs)
filters |= AllDirs;
#endif
if (sort == NoSort)
sort = d->sort;
@ -1334,10 +1322,6 @@ QFileInfoList QDir::entryInfoList(const QStringList &nameFilters, Filters filter
if (filters == NoFilter)
filters = d->filters;
#ifdef QT3_SUPPORT
if (d->matchAllDirs)
filters |= AllDirs;
#endif
if (sort == NoSort)
sort = d->sort;
@ -2177,145 +2161,6 @@ QStringList QDir::nameFiltersFromString(const QString &nameFilter)
\sa Q_INIT_RESOURCE(), {The Qt Resource System}
*/
#ifdef QT3_SUPPORT
/*!
\fn bool QDir::matchAllDirs() const
Use filter() & AllDirs instead.
*/
bool QDir::matchAllDirs() const
{
const QDirPrivate* d = d_ptr.constData();
return d->matchAllDirs;
}
/*!
\fn void QDir::setMatchAllDirs(bool on)
Use setFilter() instead.
*/
void QDir::setMatchAllDirs(bool on)
{
QDirPrivate* d = d_ptr.data();
d->initFileEngine();
d->clearFileLists();
d->matchAllDirs = on;
}
/*!
Use nameFilters() instead.
*/
QString QDir::nameFilter() const
{
const QDirPrivate* d = d_ptr.constData();
return nameFilters().join(QString(d->filterSepChar));
}
/*!
Use setNameFilters() instead.
The \a nameFilter is a wildcard (globbing) filter that understands
"*" and "?" wildcards. (See \l{QRegExp wildcard matching}.) You may
specify several filter entries, each separated by spaces or by
semicolons.
For example, if you want entryList() and entryInfoList() to list
all files ending with either ".cpp" or ".h", you would use either
dir.setNameFilters("*.cpp *.h") or dir.setNameFilters("*.cpp;*.h").
\oldcode
QString filter = "*.cpp *.cxx *.cc";
dir.setNameFilter(filter);
\newcode
QString filter = "*.cpp *.cxx *.cc";
dir.setNameFilters(filter.split(' '));
\endcode
*/
void QDir::setNameFilter(const QString &nameFilter)
{
QDirPrivate* d = d_ptr.data();
d->initFileEngine();
d->clearFileLists();
d->filterSepChar = QDirPrivate::getFilterSepChar(nameFilter);
d->nameFilters = QDirPrivate::splitFilters(nameFilter, d->filterSepChar);
}
/*!
\fn QString QDir::absPath() const
Use absolutePath() instead.
*/
/*!
\fn QString QDir::absFilePath(const QString &fileName, bool acceptAbsPath) const
Use absoluteFilePath(\a fileName) instead.
The \a acceptAbsPath parameter is ignored.
*/
/*!
\fn bool QDir::mkdir(const QString &dirName, bool acceptAbsPath) const
Use mkdir(\a dirName) instead.
The \a acceptAbsPath parameter is ignored.
*/
/*!
\fn bool QDir::rmdir(const QString &dirName, bool acceptAbsPath) const
Use rmdir(\a dirName) instead.
The \a acceptAbsPath parameter is ignored.
*/
/*!
\fn QStringList QDir::entryList(const QString &nameFilter, Filters filters,
SortFlags sort) const
\overload
Use the overload that takes a name filter string list as first
argument instead of a combination of attribute filter flags.
*/
/*!
\fn QFileInfoList QDir::entryInfoList(const QString &nameFilter, Filters filters,
SortFlags sort) const
\overload
Use the overload that takes a name filter string list as first
argument instead of a combination of attribute filter flags.
*/
/*!
\fn void QDir::convertToAbs()
Use makeAbsolute() instead.
*/
/*!
\fn QString QDir::cleanDirPath(const QString &name)
Use cleanPath() instead.
*/
/*!
\typedef QDir::FilterSpec
Use QDir::Filters instead.
*/
/*!
\typedef QDir::SortSpec
Use QDir::SortFlags instead.
*/
#endif // QT3_SUPPORT
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug debug, QDir::Filters filters)

Some files were not shown because too many files have changed in this diff Show More