1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed QApplication overloads used solely for documentation.

Browse Source 
Also removed a define which was used only for this purpose.

This change brings the constructors in line with Q{Core,Gui}Application.

Change-Id: I1134ca5611453e8445c1a4f3226846621fa8872c
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Marcel Krems 2012-04-05 22:12:15 +02:00 committed by Qt by Nokia
parent 4893a5422e
commit a7ed81b557
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/gui.pro
View File

@ -35,8 +35,6 @@ include(animation/animation.pri)
QMAKE_LIBS += $$QMAKE_LIBS_GUI QMAKE_LIBS += $$QMAKE_LIBS_GUI
DEFINES += Q_INTERNAL_QAPP_SRC
neon:*-g++* { neon:*-g++* {
DEFINES += QT_HAVE_NEON DEFINES += QT_HAVE_NEON
HEADERS += $$NEON_HEADERS HEADERS += $$NEON_HEADERS

12
src/widgets/kernel/qapplication.cpp
View File

@ -558,10 +558,6 @@ void QApplicationPrivate::process_cmdline()
\sa arguments() \sa arguments()
*/ */
QApplication::QApplication(int &argc, char **argv)
: QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000))
{ Q_D(QApplication); d->construct(); }
QApplication::QApplication(int &argc, char **argv, int _internal) QApplication::QApplication(int &argc, char **argv, int _internal)
: QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) : QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal))
{ Q_D(QApplication); d->construct(); } { Q_D(QApplication); d->construct(); }
@ -584,10 +580,6 @@ QApplication::QApplication(int &argc, char **argv, int _internal)
\snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 0 \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 0
*/ */
QApplication::QApplication(int &argc, char **argv, bool GUIenabled )
: QGuiApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, 0x040000))
{ Q_D(QApplication); d->construct(); }
QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _internal) QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _internal)
: QGuiApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, _internal)) : QGuiApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, _internal))
{ Q_D(QApplication); d->construct();} { Q_D(QApplication); d->construct();}
@ -603,10 +595,6 @@ QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _intern
be greater than zero and \a argv must contain at least one valid character be greater than zero and \a argv must contain at least one valid character
string. string.
*/ */
QApplication::QApplication(int &argc, char **argv, Type type)
: QGuiApplication(*new QApplicationPrivate(argc, argv, type, 0x040000))
{ Q_D(QApplication); d->construct(); }
QApplication::QApplication(int &argc, char **argv, Type type , int _internal) QApplication::QApplication(int &argc, char **argv, Type type , int _internal)
: QGuiApplication(*new QApplicationPrivate(argc, argv, type, _internal)) : QGuiApplication(*new QApplicationPrivate(argc, argv, type, _internal))
{ Q_D(QApplication); d->construct(); } { Q_D(QApplication); d->construct(); }

9
src/widgets/kernel/qapplication.h
View File

@ -96,11 +96,9 @@ class Q_WIDGETS_EXPORT QApplication : public QGuiApplication
public: public:
#ifndef qdoc
QApplication(int &argc, char **argv, int = ApplicationFlags); QApplication(int &argc, char **argv, int = ApplicationFlags);
QT_DEPRECATED QApplication(int &argc, char **argv, bool GUIenabled, int = ApplicationFlags); QT_DEPRECATED QApplication(int &argc, char **argv, bool GUIenabled, int = ApplicationFlags);
QApplication(int &argc, char **argv, Type, int = ApplicationFlags); QApplication(int &argc, char **argv, Type, int = ApplicationFlags);
#endif
virtual ~QApplication(); virtual ~QApplication();
static Type type(); static Type type();
@ -225,13 +223,6 @@ protected:
bool event(QEvent *); bool event(QEvent *);
bool compressEvent(QEvent *, QObject *receiver, QPostEventList *); bool compressEvent(QEvent *, QObject *receiver, QPostEventList *);
#if defined(Q_INTERNAL_QAPP_SRC) || defined(qdoc)
QApplication(int &argc, char **argv);
QT_DEPRECATED QApplication(int &argc, char **argv, bool GUIenabled);
QApplication(int &argc, char **argv, Type);
#endif
private: private:
Q_DISABLE_COPY(QApplication) Q_DISABLE_COPY(QApplication)
Q_DECLARE_PRIVATE(QApplication) Q_DECLARE_PRIVATE(QApplication)

2
src/widgets/widgets.pro
View File

@ -51,8 +51,6 @@ testcocoon {
load(testcocoon) load(testcocoon)
} }
DEFINES += Q_INTERNAL_QAPP_SRC
INCLUDEPATH += ../3rdparty/harfbuzz/src INCLUDEPATH += ../3rdparty/harfbuzz/src
win32:!contains(QT_CONFIG, directwrite) { win32:!contains(QT_CONFIG, directwrite) {