summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/printsupport/kernel/qprinter.cpp27
-rw-r--r--src/sql/kernel/qsql.qdoc24
-rw-r--r--src/widgets/dialogs/qcolordialog.cpp9
-rw-r--r--src/widgets/kernel/qapplication.cpp19
-rw-r--r--src/widgets/widgets/qmenubar.cpp10
-rw-r--r--src/widgets/widgets/qslider.cpp14
-rw-r--r--src/widgets/widgets/qtextedit.cpp13
7 files changed, 0 insertions, 116 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index d713639dcc..6682550849 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -365,17 +365,6 @@ void QPrinterPrivate::addToManualSetList(QPrintEngine::PrintEnginePropertyKey ke
*/
/*!
- \enum QPrinter::PrinterOption
- \compat
-
- Use QAbstractPrintDialog::PrintDialogOption instead.
-
- \value PrintToFile
- \value PrintSelection
- \value PrintPageRange
-*/
-
-/*!
\enum QPrinter::PaperSize
\since 4.4
@@ -513,22 +502,6 @@ void QPrinterPrivate::addToManualSetList(QPrintEngine::PrintEnginePropertyKey ke
\sa setPrintRange(), printRange()
*/
-/*
- \enum QPrinter::PrinterOption
-
- This enum describes various printer options that appear in the
- printer setup dialog. It is used to enable and disable these
- options in the setup dialog.
-
- \value PrintToFile Describes if print to file should be enabled.
- \value PrintSelection Describes if printing selections should be enabled.
- \value PrintPageRange Describes if printing page ranges (from, to) should
- be enabled
- \value PrintCurrentPage if Print Current Page option should be enabled
-
- \sa setOptionEnabled(), isOptionEnabled()
-*/
-
/*!
Creates a new printer object with the given \a mode.
*/
diff --git a/src/sql/kernel/qsql.qdoc b/src/sql/kernel/qsql.qdoc
index 0762fa977e..394c255b35 100644
--- a/src/sql/kernel/qsql.qdoc
+++ b/src/sql/kernel/qsql.qdoc
@@ -39,30 +39,6 @@
*/
/*!
- \enum QSql::Confirm
- \compat
-
- This enum type describes edit confirmations.
-
- \value Yes
- \value No
- \value Cancel
-*/
-
-/*!
- \enum QSql::Op
- \compat
-
- This enum type describes edit operations.
-
- \value None
- \value Insert
- \value Update
- \value Delete
-*/
-
-
-/*!
\enum QSql::Location
This enum type describes special SQL navigation locations:
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index 263d3a623c..569a10653f 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -2000,12 +2000,3 @@ QT_END_NAMESPACE
#endif // QT_NO_COLORDIALOG
-/*!
- \fn QColor QColorDialog::getColor(const QColor &init, QWidget *parent, const char *name)
- \compat
-*/
-
-/*!
- \fn QRgb QColorDialog::getRgba(QRgb rgba, bool *ok, QWidget *parent, const char *name)
- \compat
-*/
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index a099faae3f..40263bf632 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -3925,13 +3925,6 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
*/
/*!
- \typedef QApplication::ColorMode
- \compat
-
- Use ColorSpec instead.
-*/
-
-/*!
\fn Qt::MacintoshVersion QApplication::macVersion()
Use QSysInfo::MacintoshVersion instead.
@@ -4023,18 +4016,6 @@ bool QApplicationPrivate::inPopupMode() const
return QApplicationPrivate::popupWidgets != 0;
}
-/*! \variable QApplication::NormalColors
- \compat
-
- Use \l NormalColor instead.
-*/
-
-/*! \variable QApplication::CustomColors
- \compat
-
- Use \l CustomColor instead.
-*/
-
#ifdef QT_KEYPAD_NAVIGATION
/*!
Sets the kind of focus navigation Qt should use to \a mode.
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 5ec41b8ba6..c9818e056c 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -1906,16 +1906,6 @@ QAction *QMenuBar::defaultAction() const
*/
/*!
- \enum QMenuBar::Separator
-
- \compat
-
- \value Never
- \value InWindowsStyle
-
-*/
-
-/*!
\fn void QMenuBar::addAction(QAction *action)
\overload
diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp
index 7f77bc9d03..5f37240d67 100644
--- a/src/widgets/widgets/qslider.cpp
+++ b/src/widgets/widgets/qslider.cpp
@@ -536,20 +536,6 @@ QSlider::TickPosition QSlider::tickPosition() const
}
/*!
- \fn TickPosition QSlider::tickmarks() const
- \compat
-
- Use tickPosition() instead.
-*/
-
-/*!
- \fn QSlider::setTickmarks(TickPosition position)
- \compat
-
- Use setTickPosition() instead.
-*/
-
-/*!
\property QSlider::tickInterval
\brief the interval between tickmarks
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 198d101dbf..86b87b3998 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -2491,19 +2491,6 @@ void QTextEdit::ensureCursorVisible()
}
/*!
- \enum QTextEdit::KeyboardAction
-
- \compat
-
- \value ActionBackspace
- \value ActionDelete
- \value ActionReturn
- \value ActionKill
- \value ActionWordBackspace
- \value ActionWordDelete
-*/
-
-/*!
\fn bool QTextEdit::find(const QString &exp, bool cs, bool wo)
Use the find() overload that takes a QTextDocument::FindFlags