From 4ce225fc47241c05fb609fb1dd00d186c61542de Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 17 Mar 2012 23:19:16 +0100 Subject: Remove refernces to qt3support Change-Id: I85aec2a0018baccac793c2233fd8e2f04a88b922 Reviewed-by: Casper van Donderen --- .gitignore | 1 - doc/config/modules/qtqt3support.qdocconf | 13 ---- doc/config/qdeclarative.qdocconf | 4 +- doc/config/qt-defines.qdocconf | 1 - doc/config/qt-project.qdocconf | 1 - doc/doc.pri | 1 - doc/src/deployment/deployment.qdoc | 2 - doc/src/development/designer-manual.qdoc | 9 +-- doc/src/development/qmake-manual.qdoc | 2 - doc/src/development/tools-list.qdoc | 2 - doc/src/getting-started/installation.qdoc | 1 - doc/src/modules.qdoc | 31 -------- doc/src/platforms/platform-notes-rtos.qdoc | 12 +-- doc/src/platforms/platform-notes.qdoc | 2 - doc/src/snippets/code/doc_src_qt3support.cpp | 43 ----------- doc/src/snippets/code/doc_src_qt3support.pro | 43 ----------- doc/src/snippets/code/doc_src_qt4-intro.cpp | 106 --------------------------- doc/src/snippets/code/doc_src_qt4-intro.pro | 73 ------------------ 18 files changed, 6 insertions(+), 341 deletions(-) delete mode 100644 doc/config/modules/qtqt3support.qdocconf delete mode 100644 doc/src/snippets/code/doc_src_qt3support.cpp delete mode 100644 doc/src/snippets/code/doc_src_qt3support.pro delete mode 100644 doc/src/snippets/code/doc_src_qt4-intro.cpp delete mode 100644 doc/src/snippets/code/doc_src_qt4-intro.pro diff --git a/.gitignore b/.gitignore index 990859da..34f9704d 100644 --- a/.gitignore +++ b/.gitignore @@ -68,7 +68,6 @@ bin/makeqpf* bin/pixeltool* bin/qmake* bin/qdoc3* -bin/qt3to4* bin/qtdemo* bin/qttracereplay* bin/rcc* diff --git a/doc/config/modules/qtqt3support.qdocconf b/doc/config/modules/qtqt3support.qdocconf deleted file mode 100644 index 59ff41fc..00000000 --- a/doc/config/modules/qtqt3support.qdocconf +++ /dev/null @@ -1,13 +0,0 @@ -headerdirs += $QT_QT3SUPPORT_SOURCES/.. - -sourcedirs += $QT_QT3SUPPORT_SOURCES/.. \ - $QT_QT3SUPPORT_SOURCES/../../doc/src - -exampledirs += $QT_QT3SUPPORT_SOURCES/../.. \ - $QT_QT3SUPPORT_SOURCES/../../doc/src \ - $QT_QT3SUPPORT_SOURCES/../../examples - -imagedirs += $QT_QT3SUPPORT_SOURCES/../../doc/src/images \ - $QT_QT3SUPPORT_SOURCES/../../examples - -excludedirs += $QT_QT3SUPPORT_SOURCES/../../doc/src/snippets diff --git a/doc/config/qdeclarative.qdocconf b/doc/config/qdeclarative.qdocconf index 605c28b1..6f61329d 100644 --- a/doc/config/qdeclarative.qdocconf +++ b/doc/config/qdeclarative.qdocconf @@ -12,10 +12,10 @@ qmlonly = true edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \ QtXmlPatterns QtTest edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtSql QtSvg \ - QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \ + QtWebKit QtXml QtXmlPatterns QtHelp \ QtDesigner QtAssistant QAxContainer Phonon \ QAxServer QtUiTools QtTest QtDBus -edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest +edition.DesktopLight.modules = QtCore QtDBus QtGui QtTest edition.DesktopLight.groups = -graphicsview-api qhp.projects = Qml diff --git a/doc/config/qt-defines.qdocconf b/doc/config/qt-defines.qdocconf index aaf935ac..23ada44d 100644 --- a/doc/config/qt-defines.qdocconf +++ b/doc/config/qt-defines.qdocconf @@ -4,7 +4,6 @@ defines = Q_QDOC \ QT_COMPAT \ QT_KEYPAD_NAVIGATION \ QT_NO_EGL \ - QT3_SUPPORT \ Q_WS_.* \ Q_OS_.* \ Q_BYTE_ORDER \ diff --git a/doc/config/qt-project.qdocconf b/doc/config/qt-project.qdocconf index e58faa15..19b05907 100644 --- a/doc/config/qt-project.qdocconf +++ b/doc/config/qt-project.qdocconf @@ -60,7 +60,6 @@ include($QT_MULTIMEDIA_QDOCCONF) include($QT_PHONON_QDOCCONF) include($QT_PUBLISHSUBSCRIBE_QDOCCONF) include($QT_3D_QDOCCONF) -include($QT_QT3SUPPORT_QDOCCONF) include($QT_SCRIPT_QDOCCONF) include($QT_SENSORS_QDOCCONF) include($QT_SERVICEFRAMEWORK_QDOCCONF) diff --git a/doc/doc.pri b/doc/doc.pri index 88f76ec0..50768cf0 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -44,7 +44,6 @@ MODULES = activeqt \ webkit \ webkit-examples-and-demos \ xmlpatterns \ - qt3support \ contacts \ organizer \ versit \ diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index a03506e4..76ae8b9d 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -94,7 +94,6 @@ \li \l {QtXmlPatterns} \row \li \l {Phonon Module}{Phonon} - \li \l {Qt3Support} \endtable Since Qt is not a system library, it has to be redistributed along @@ -1440,7 +1439,6 @@ \li The Phonon backend plugin is deployed if the application uses the \l{Phonon Module} {Phonon} module. \li The svg icon plugin is deployed if the application uses the QtSvg module. \li The accessibility plugin is always deployed. - \li Accessibility for Qt3Support is deployed if the application uses the Qt3Support module. \endlist \note If you want a 3rd party library to be included in your diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc index f85a2854..3158b519 100644 --- a/doc/src/development/designer-manual.qdoc +++ b/doc/src/development/designer-manual.qdoc @@ -2187,19 +2187,14 @@ pixmap property in the property editor. \QD can display custom widgets through its extensible plugin mechanism, allowing the range of designable widgets to be extended by the user and - third parties. This feature also allows \QD to optionally support - \l{Qt3Support}{Qt 3 compatibility widgets}. Alternatively, it is possible + third parties. Alternatively, it is possible to use existing widgets as placeholders for widget classes that provide similar APIs. - Widgets from the Qt3Support library are made available via in \QD's support - for custom widgets. - \section1 Handling Custom Widgets - Although \QD supports all of the standard Qt widgets, and can be configured - to handle widgets supplied in the Qt3Support library, some specialized + Although \QD supports all of the standard Qt widgets, some specialized widgets may not be available as standard for a number of reasons: \list diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 318d6261..60570957 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -477,7 +477,6 @@ \row \li svg \li QtSvg module \row \li xml \li QtXml module \row \li xmlpatterns \li QtXmlPatterns module - \row \li qt3support \li Qt3Support module \endtable Note that adding the \c opengl option to the \c QT variable automatically @@ -3005,7 +3004,6 @@ \row \li svg \li QtSvg module \row \li xml \li QtXml module \row \li webkit \li WebKit integration - \row \li qt3support \li Qt3Support module \endtable By default, \c QT contains both \c core and \c gui, ensuring that standard diff --git a/doc/src/development/tools-list.qdoc b/doc/src/development/tools-list.qdoc index 13496ea9..1005ea62 100644 --- a/doc/src/development/tools-list.qdoc +++ b/doc/src/development/tools-list.qdoc @@ -59,8 +59,6 @@ \li Qt Embedded (Linux and Windows CE) configuration tool. \row \li \l{Examples and Demos Launcher} \li A launcher for Qt's Examples and Demonstration programs. - \row \li \l{qt3to4 - The Qt 3 to 4 Porting Tool} - \li A tool to assist in porting applications from Qt 3 to Qt 4. \row \li \l{QtDBus XML compiler (qdbusxml2cpp)} \li A tool to convert D-Bus interface descriptions to C++ source code. \row \li \l{D-Bus Viewer} diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 49f7ce31..0a9e71fb 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -1508,7 +1508,6 @@ We hope you will enjoy using Qt. oci, odbc, tds, db2, sqlite, sqlite2, ibase. Drivers marked with a '+' during configure have been detected as available on this system. \row \li \c {-system-sqlite} \li Use sqlite from the operating system. \li - \row \li \c {-no-qt3support} \li Disables the Qt 3 support functionality. \li \row \li \c {-no-opengl} \li Disables OpenGL functionality \li \row \li \c {-opengl } \li Enable OpenGL support with specified API version. \li Available values for : desktop - Enable support for diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 9d805c14..44f4df9b 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -64,7 +64,6 @@ \row \li \l{QtXml} \li Classes for handling XML \row \li \l{QtXmlPatterns} \li An XQuery & XPath engine for XML and custom data models \row \li \l{Qt3D Module}{Qt3D} \li Classes and elements for the 3D API. - \row \li \l{Qt3Support} \li Qt 3 compatibility classes \row \li \l{Phonon Module}{Phonon} \li Multimedia framework classes \header \li {2,1} \b{Modules for working with Qt's tools} \row \li \l{QtDesigner} \li Classes for extending \QD @@ -490,36 +489,6 @@ \endlegalese */ -/*! - \module Qt3Support - \title Qt3Support Module - \ingroup modules - - \keyword Qt3Support - \brief The Qt3Support module provides classes that ease porting - from Qt 3 to Qt 4. - - \warning The classes in this module are intended to be used in - intermediate stages of a porting process and are not intended - to be used in production code. - - To include the definitions of the module's classes, use the - following directive: - - \snippet doc/src/snippets/code/doc_src_qt3support.cpp 0 - - To link against the module, add this line to your \l qmake \c - .pro file: - - \snippet doc/src/snippets/code/doc_src_qt3support.pro 1 - - \note Since this module provides compatibility classes for - diverse parts of the Qt 3 API, it has dependencies on the QtCore, - QtGui, QtNetwork, QtSql, and QtXml modules. - - \sa {Porting to Qt 4} -*/ - /*! \module QtContacts \title QtContacts Module diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc index e9bff76e..2b82296b 100644 --- a/doc/src/platforms/platform-notes-rtos.qdoc +++ b/doc/src/platforms/platform-notes-rtos.qdoc @@ -71,8 +71,6 @@ processes. \row \li Phonon \li There is no standard audio backend, which could be integrated into Phonon. - \row \li Qt3Support - \li The Qt3Support library is not available on VxWorks. \endtable @@ -189,8 +187,6 @@ \li QT_NO_QWS_MULTIPROCESS is always on due to missing shared memory support. \row \li Phonon \li There is no standard audio backend, which could be integrated into Phonon. - \row \li Qt3Support - \li The Qt3Support library is not available on QNX. \endtable \section1 Build Instructions @@ -203,14 +199,13 @@ i386 QNX target: \code - configure -xplatform unsupported/qws/qnx-i386-g++ -embedded i386 -no-gfx-linuxfb -no-mouse-linuxtp -no-kbd-tty -no-qt3support -qt-gfx-qnx -qt-mouse-qnx -qt-kbd-qnx -no-exceptions + configure -xplatform unsupported/qws/qnx-i386-g++ -embedded i386 -no-gfx-linuxfb -no-mouse-linuxtp -no-kbd-tty -qt-gfx-qnx -qt-mouse-qnx -qt-kbd-qnx -no-exceptions \endcode \list \li \c{-xplatform unsupported/qws/qnx-i386-g++} - selects the i386-g++ mkspec for QNX \li \c{-embedded i386} - builds the embedded version of Qt and sets the architecture to i386 \li \c{-no-gfx-linuxfb}, \c{-no-mouse-linuxtp} and \c{-no-kbd-tty} are Linux specific and won't work on QNX - \li \c{-no-qt3support} - required since the Qt3 support classes are not supported on QNX \li \c{-no-exceptions} - reduces the size of the library by disabling exception support \li \c{-qt-gfx-qnx} - enables the experimental \c{io-graphics} based display driver \li \c{-qt-mouse-qnx} - enables the experimental \c{devi-hig} based mouse driver @@ -292,8 +287,6 @@ \li QT_NO_QWS_MULTIPROCESS is always on due to missing shared memory support. \row \li Phonon \li There is no standard audio backend. - \row \li Qt3Support - \li The Qt3Support library is not available on INTEGRITY. \row \li QtScript \li Not available - INTEGRITY's mmap() doesn't support allocating memory. \endtable @@ -308,7 +301,7 @@ ARM INTEGRITY target: \code - ./configure --hostprefix=$PWD -embedded integrity -xplatform unsupported/qws/integrity-arm-cxarm -static -qt-kbd-integrity -qt-mouse-integrity -no-mouse-linuxtp -no-mouse-pc -no-kbd-tty -qt-gfx-integrityfb -no-qt3support -no-gfx-linuxfb -no-glib -no-openssl -no-largefile -little-endian -arch integrity -prefix / -opensource -no-feature-QWS_MULTIPROCESS -no-feature-SHAREDMEMORY -no-feature-PROCESS -no-feature-SYSTEMSEMAPHORE -no-feature-PRINTER -no-feature-QWS_QPF2 -no-libtiff -no-exceptions -no-scripttools + ./configure --hostprefix=$PWD -embedded integrity -xplatform unsupported/qws/integrity-arm-cxarm -static -qt-kbd-integrity -qt-mouse-integrity -no-mouse-linuxtp -no-mouse-pc -no-kbd-tty -qt-gfx-integrityfb -no-gfx-linuxfb -no-glib -no-openssl -no-largefile -little-endian -arch integrity -prefix / -opensource -no-feature-QWS_MULTIPROCESS -no-feature-SHAREDMEMORY -no-feature-PROCESS -no-feature-SYSTEMSEMAPHORE -no-feature-PRINTER -no-feature-QWS_QPF2 -no-libtiff -no-exceptions -no-scripttools \endcode \list @@ -318,7 +311,6 @@ \li \c{-xplatform unsupported/qws/integrity-arm-cxarm} - selects the arm-cxarm mkspec for INTEGRITY \li \c{-static} - specifies a static build of Qt \li \c{-no-gfx-linuxfb}, \c{-no-mouse-linuxtp}, \c{-no-mouse-pc} and \c{-no-kbd-tty} are Linux specific and won't work on INTEGRITY - \li \c{-no-qt3support} - required since the Qt3 support classes are not supported on INTEGRITY \li \c{-no-exceptions} - reduces the size of the library by disabling exception support \li \c{-no-openssl} - disable support for OpenSSL \li \c(-no-libtiff} - disable support for libTIFF diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index a7bb7653..4117f2d7 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -724,8 +724,6 @@ \li No current plans to support this feature. \row \li Printing support \li No current plans to support this feature. - \row \li Qt3Support - \li No current plans to support this feature. \endtable The following technologies have limited support: diff --git a/doc/src/snippets/code/doc_src_qt3support.cpp b/doc/src/snippets/code/doc_src_qt3support.cpp deleted file mode 100644 index 7bc87125..00000000 --- a/doc/src/snippets/code/doc_src_qt3support.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [0] -#include -//! [0] diff --git a/doc/src/snippets/code/doc_src_qt3support.pro b/doc/src/snippets/code/doc_src_qt3support.pro deleted file mode 100644 index 727c861b..00000000 --- a/doc/src/snippets/code/doc_src_qt3support.pro +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#! [1] -QT += qt3support -#! [1] diff --git a/doc/src/snippets/code/doc_src_qt4-intro.cpp b/doc/src/snippets/code/doc_src_qt4-intro.cpp deleted file mode 100644 index 79772bdd..00000000 --- a/doc/src/snippets/code/doc_src_qt4-intro.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [3] -#include -//! [3] - - -//! [4] -#include -#include -#include -//! [4] - - -//! [5] -#include -//! [5] - - -//! [6] -#include -//! [6] - - -//! [7] -using namespace Qt; -//! [7] - - -//! [8] -QLabel *label1 = new QLabel("Hello", this); -QLabel *label2 = new QLabel(this, "Hello"); -//! [8] - - -//! [9] -MyWidget::MyWidget(QWidget *parent, const char *name) - : QWidget(parent, name) -{ - ... -} -//! [9] - - -//! [10] -// DEPRECATED -if (obj->inherits("QPushButton")) { - QPushButton *pushButton = (QPushButton *)obj; - ... -} -//! [10] - - -//! [11] -QPushButton *pushButton = qobject_cast(obj); -if (pushButton) { - ... -} -//! [11] - - -//! [12] -QLabel *label = new QLabel; -QPointer safeLabel = label; -safeLabel->setText("Hello world!"); -delete label; -// safeLabel is now 0, whereas label is a dangling pointer -//! [12] diff --git a/doc/src/snippets/code/doc_src_qt4-intro.pro b/doc/src/snippets/code/doc_src_qt4-intro.pro deleted file mode 100644 index 39d66bff..00000000 --- a/doc/src/snippets/code/doc_src_qt4-intro.pro +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#! [0] -QT -= gui -#! [0] - - -#! [1] -QT += network opengl sql qt3support -#! [1] - - -#! [2] -CONFIG += uic3 -#! [2] - - -#! [13] -QT += qt3support -#! [13] - - -#! [14] -DEFINES += QT3_SUPPORT -#! [14] - - -#! [15] -DEFINES += QT3_SUPPORT_WARNINGS -#! [15] - - -#! [16] -DEFINES += QT3_SUPPORT -#! [16] -- cgit v1.2.1