diff options
Diffstat (limited to 'src/widgets/widgets')
44 files changed, 137 insertions, 133 deletions
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 14498c8b90..d9cbad4766 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -1475,7 +1475,7 @@ bool QAbstractScrollAreaPrivate::canStartScrollingAt( const QPoint &startPos ) { Q_Q(QAbstractScrollArea); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // don't start scrolling when a drag mode has been set. // don't start scrolling on a movable item. if (QGraphicsView *view = qobject_cast<QGraphicsView *>(q)) { diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 58a1ff9e7f..4679ed95c5 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -487,7 +487,7 @@ QComboBoxPrivateContainer::QComboBoxPrivateContainer(QAbstractItemView *itemView void QComboBoxPrivateContainer::scrollItemView(int action) { -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) if (view->verticalScrollBar()) view->verticalScrollBar()->triggerAction(static_cast<QAbstractSlider::SliderAction>(action)); #endif @@ -506,7 +506,7 @@ void QComboBoxPrivateContainer::hideScrollers() */ void QComboBoxPrivateContainer::updateScrollers() { -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) if (!top || !bottom) return; @@ -533,7 +533,7 @@ void QComboBoxPrivateContainer::updateScrollers() top->hide(); bottom->hide(); } -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) } /* @@ -564,7 +564,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) if (view) { view->removeEventFilter(this); view->viewport()->removeEventFilter(this); -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) disconnect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(updateScrollers())); disconnect(view->verticalScrollBar(), SIGNAL(rangeChanged(int,int)), @@ -589,7 +589,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); QStyleOptionComboBox opt = comboStyleOption(); const bool usePopup = combo->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, combo); -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) if (usePopup) view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); #endif @@ -601,7 +601,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) view->setFrameStyle(QFrame::NoFrame); view->setLineWidth(0); view->setEditTriggers(QAbstractItemView::NoEditTriggers); -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(updateScrollers())); connect(view->verticalScrollBar(), SIGNAL(rangeChanged(int,int)), @@ -758,7 +758,7 @@ void QComboBoxPrivateContainer::hideEvent(QHideEvent *) { emit resetButton(); combo->update(); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // QGraphicsScenePrivate::removePopup closes the combo box popup, it hides it non-explicitly. // Hiding/showing the QComboBox after this will unexpectedly show the popup as well. // Re-hiding the popup container makes sure it is explicitly hidden. diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index a219e4ccb6..c08c820127 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -39,8 +39,6 @@ #include "qdial.h" -#ifndef QT_NO_DIAL - #include <qapplication.h> #include <qbitmap.h> #include <qcolor.h> @@ -480,5 +478,3 @@ bool QDial::event(QEvent *e) QT_END_NAMESPACE #include "moc_qdial.cpp" - -#endif // QT_NO_DIAL diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index 472b14fcdb..ed753d86b0 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -43,12 +43,11 @@ #include <QtWidgets/qtwidgetsglobal.h> -#if QT_CONFIG(dial) - #include <QtWidgets/qabstractslider.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(dial); +QT_BEGIN_NAMESPACE class QDialPrivate; class QStyleOptionSlider; @@ -101,6 +100,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(dial) - #endif // QDIAL_H diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 9e323df9a6..611f3f88db 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qgroupbox.h" -#ifndef QT_NO_GROUPBOX + #include "qapplication.h" #include "qbitmap.h" #include "qdrawutil.h" @@ -751,9 +751,6 @@ void QGroupBox::mouseReleaseEvent(QMouseEvent *event) update(style()->subControlRect(QStyle::CC_GroupBox, &box, QStyle::SC_GroupBoxCheckBox, this)); } - QT_END_NAMESPACE #include "moc_qgroupbox.cpp" - -#endif //QT_NO_GROUPBOX diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index a132d48e16..668dc03f3d 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(groupbox); -#ifndef QT_NO_GROUPBOX +QT_BEGIN_NAMESPACE class QGroupBoxPrivate; class QStyleOptionGroupBox; @@ -104,8 +103,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_setChildrenEnabled(bool b)) }; -#endif // QT_NO_GROUPBOX - QT_END_NAMESPACE #endif // QGROUPBOX_H diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index f57fa4fd85..a4444a2b2c 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -1795,7 +1795,7 @@ QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property, QVariant arg return QVariant(d->xToPos(pt.x(), QTextLine::CursorBetweenCharacters)); return QVariant(d->control->cursor()); } case Qt::ImSurroundingText: - return QVariant(d->control->text()); + return QVariant(d->control->surroundingText()); case Qt::ImCurrentSelection: return QVariant(selectedText()); case Qt::ImMaximumTextLength: diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 83dab9e110..79241ef720 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -56,6 +56,7 @@ #include "qinputmethod.h" #include "qlist.h" #endif +#include <qpainter.h> #include <qpropertyanimation.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 2d695f8411..92bdd4ad60 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -56,7 +56,9 @@ #ifndef QT_NO_LINEEDIT #include "private/qwidget_p.h" #include "QtWidgets/qlineedit.h" +#if QT_CONFIG(toolbutton) #include "QtWidgets/qtoolbutton.h" +#endif #include "QtGui/qtextlayout.h" #include "QtGui/qicon.h" #include "QtWidgets/qstyleoption.h" diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 694a36ed5b..e1841bbc55 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -51,7 +51,9 @@ #include <qapplication.h> #include <qmenubar.h> +#if QT_CONFIG(statusbar) #include <qstatusbar.h> +#endif #include <qevent.h> #include <qstyle.h> #include <qdebug.h> @@ -578,7 +580,7 @@ void QMainWindow::setMenuWidget(QWidget *menuBar) } #endif // QT_NO_MENUBAR -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) /*! Returns the status bar for the main window. This function creates and returns an empty status bar if the status bar does not exist. @@ -615,7 +617,7 @@ void QMainWindow::setStatusBar(QStatusBar *statusbar) } d->layout->setStatusBar(statusbar); } -#endif // QT_NO_STATUSBAR +#endif // QT_CONFIG(statusbar) /*! Returns the central widget for the main window. This function @@ -1315,7 +1317,7 @@ bool QMainWindow::event(QEvent *event) #if QT_CONFIG(statustip) case QEvent::StatusTip: -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) if (QStatusBar *sb = d->layout->statusBar()) sb->showMessage(static_cast<QStatusTipEvent*>(event)->tip()); else diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index aa26d4c23b..e0592d2c3f 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -131,7 +131,7 @@ public: void setMenuWidget(QWidget *menubar); #endif -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *statusBar() const; void setStatusBar(QStatusBar *statusbar); #endif diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 2c1c2ab75c..da5f00efe0 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -59,7 +59,9 @@ #endif #include <qapplication.h> +#if QT_CONFIG(statusbar) #include <qstatusbar.h> +#endif #include <qstring.h> #include <qstyle.h> #include <qstylepainter.h> @@ -2310,7 +2312,7 @@ void QMainWindowLayout::setDockOptions(QMainWindow::DockOptions opts) invalidate(); } -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *QMainWindowLayout::statusBar() const { return statusbar ? qobject_cast<QStatusBar *>(statusbar->widget()) : 0; } @@ -2322,7 +2324,7 @@ void QMainWindowLayout::setStatusBar(QStatusBar *sb) statusbar = sb ? new QWidgetItemV2(sb) : 0; invalidate(); } -#endif // QT_NO_STATUSBAR +#endif // QT_CONFIG(statusbar) QWidget *QMainWindowLayout::centralWidget() const { diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 948d6edeef..2ffc367da1 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -446,7 +446,7 @@ public: QLayoutItem *statusbar; -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *statusBar() const; void setStatusBar(QStatusBar *sb); #endif diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 58212a737a..4ee5b169e7 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -66,7 +66,9 @@ #include "qmenu_p.h" #include "qmenubar_p.h" #include "qwidgetaction.h" +#if QT_CONFIG(toolbutton) #include "qtoolbutton.h" +#endif #include "qpushbutton.h" #include "qtooltip.h" #include <private/qpushbutton_p.h> @@ -2324,7 +2326,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction) const bool actionListChanged = d->itemsDirty; QRect screen; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool isEmbedded = !bypassGraphicsProxyWidget(this) && d->nearestGraphicsProxyWidget(this); if (isEmbedded) screen = d->popupGeometry(this); @@ -3593,7 +3595,7 @@ void QMenu::internalDelayedPopup() d->activeMenu->d_func()->causedPopup.action = d->currentAction; QRect screen; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool isEmbedded = !bypassGraphicsProxyWidget(this) && d->nearestGraphicsProxyWidget(this); if (isEmbedded) screen = d->popupGeometry(this); diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 552409a4ed..fd48058ec3 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -51,7 +51,9 @@ #include <qevent.h> #include <qmainwindow.h> #include <qtoolbar.h> +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #if QT_CONFIG(whatsthis) #include <qwhatsthis.h> #endif diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index e19d4d4702..6d3f5649c2 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -947,7 +947,7 @@ void QPlainTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCurso } } -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) void QPlainTextEditPrivate::_q_adjustScrollbars() { diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h index 803623c974..2484f9a33c 100644 --- a/src/widgets/widgets/qplaintextedit_p.h +++ b/src/widgets/widgets/qplaintextedit_p.h @@ -54,7 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" +#if QT_CONFIG(scrollbar) #include "QtWidgets/qscrollbar.h" +#endif #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" #include "QtWidgets/qmenu.h" diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index e26673a010..91f7efa08c 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qprogressbar.h" -#ifndef QT_NO_PROGRESSBAR + #include <qlocale.h> #include <qevent.h> #include <qpainter.h> @@ -623,5 +623,3 @@ QString QProgressBar::format() const QT_END_NAMESPACE #include "moc_qprogressbar.cpp" - -#endif // QT_NO_PROGRESSBAR diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index 2dbb7240c5..e0f5e9084b 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(progressbar); -#ifndef QT_NO_PROGRESSBAR +QT_BEGIN_NAMESPACE class QProgressBarPrivate; class QStyleOptionProgressBar; @@ -119,8 +118,6 @@ private: Q_DISABLE_COPY(QProgressBar) }; -#endif // QT_NO_PROGRESSBAR - QT_END_NAMESPACE #endif // QPROGRESSBAR_H diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index a98f3fe085..e40c922e97 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -47,8 +47,6 @@ #include "qmenu.h" #include <QtCore/qelapsedtimer.h> -#ifndef QT_NO_SCROLLBAR - #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif @@ -728,5 +726,3 @@ Q_WIDGETS_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollb QT_END_NAMESPACE #include "moc_qscrollbar.cpp" - -#endif // QT_NO_SCROLLBAR diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index c180a62585..22b9bfcddb 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -43,10 +43,10 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> -#if QT_CONFIG(scrollbar) - #include <QtWidgets/qabstractslider.h> +QT_REQUIRE_CONFIG(scrollbar); + QT_BEGIN_NAMESPACE class QScrollBarPrivate; @@ -96,6 +96,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(scrollbar) - #endif // QSCROLLBAR_H diff --git a/src/widgets/widgets/qscrollbar_p.h b/src/widgets/widgets/qscrollbar_p.h index e748edf6a9..8693495c6f 100644 --- a/src/widgets/widgets/qscrollbar_p.h +++ b/src/widgets/widgets/qscrollbar_p.h @@ -55,6 +55,8 @@ #include "private/qabstractslider_p.h" #include "qstyle.h" +QT_REQUIRE_CONFIG(scrollbar); + QT_BEGIN_NAMESPACE class QScrollBarPrivate : public QAbstractSliderPrivate diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 7d507aa7f4..5f49623941 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qsplitter.h" -#ifndef QT_NO_SPLITTER #include "qapplication.h" #include "qcursor.h" @@ -1820,5 +1819,3 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter) QT_END_NAMESPACE #include "moc_qsplitter.cpp" - -#endif // QT_NO_SPLITTER diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index e9ef3c3f2d..bc4d7bca39 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -44,10 +44,9 @@ #include <QtWidgets/qframe.h> #include <QtWidgets/qsizepolicy.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(splitter); -#ifndef QT_NO_SPLITTER +QT_BEGIN_NAMESPACE class QSplitterPrivate; class QTextStream; @@ -164,8 +163,6 @@ private: Q_DECLARE_PRIVATE(QSplitterHandle) }; -#endif // QT_NO_SPLITTER - QT_END_NAMESPACE #endif // QSPLITTER_H diff --git a/src/widgets/widgets/qsplitter_p.h b/src/widgets/widgets/qsplitter_p.h index 34ae34121e..f0d621004f 100644 --- a/src/widgets/widgets/qsplitter_p.h +++ b/src/widgets/widgets/qsplitter_p.h @@ -54,6 +54,8 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qframe_p.h" +QT_REQUIRE_CONFIG(splitter); + QT_BEGIN_NAMESPACE static const uint Default = 2; diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp index bdf728ead2..da7c86a2af 100644 --- a/src/widgets/widgets/qstatusbar.cpp +++ b/src/widgets/widgets/qstatusbar.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qstatusbar.h" -#ifndef QT_NO_STATUSBAR #include "qlist.h" #include "qdebug.h" @@ -787,5 +786,3 @@ bool QStatusBar::event(QEvent *e) QT_END_NAMESPACE #include "moc_qstatusbar.cpp" - -#endif diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index aaabb99a27..9ac637931c 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(statusbar); -#ifndef QT_NO_STATUSBAR +QT_BEGIN_NAMESPACE class QStatusBarPrivate; @@ -94,8 +93,6 @@ private: Q_DECLARE_PRIVATE(QStatusBar) }; -#endif // QT_NO_STATUSBAR - QT_END_NAMESPACE #endif // QSTATUSBAR_H diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index 902a6afb8a..0797120960 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -40,8 +40,6 @@ #include "qtextbrowser.h" #include "qtextedit_p.h" -#ifndef QT_NO_TEXTBROWSER - #include <qstack.h> #include <qapplication.h> #include <qevent.h> @@ -1270,5 +1268,3 @@ bool QTextBrowser::event(QEvent *e) QT_END_NAMESPACE #include "moc_qtextbrowser.cpp" - -#endif // QT_NO_TEXTBROWSER diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index 48b64d1216..f36c86bc86 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -44,10 +44,9 @@ #include <QtWidgets/qtextedit.h> #include <QtCore/qurl.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(textbrowser); -#ifndef QT_NO_TEXTBROWSER +QT_BEGIN_NAMESPACE class QTextBrowserPrivate; @@ -122,8 +121,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_highlightLink(const QString &)) }; -#endif // QT_NO_TEXTBROWSER - QT_END_NAMESPACE #endif // QTEXTBROWSER_H diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 3eaf60116e..6ea67d385e 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -39,7 +39,9 @@ #include "qtextedit_p.h" #include "qlineedit.h" +#if QT_CONFIG(textbrowser) #include "qtextbrowser.h" +#endif #ifndef QT_NO_TEXTEDIT #include <qfont.h> @@ -243,7 +245,7 @@ void QTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCursor::Mo control->setTextCursor(cursor); } -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) static QSize documentSize(QWidgetTextControl *control) { QTextDocument *doc = control->document(); @@ -2155,7 +2157,7 @@ void QTextEdit::setReadOnly(bool ro) Qt::TextInteractionFlags flags = Qt::NoTextInteraction; if (ro) { flags = Qt::TextSelectableByMouse; -#ifndef QT_NO_TEXTBROWSER +#if QT_CONFIG(textbrowser) if (qobject_cast<QTextBrowser *>(this)) flags |= Qt::TextBrowserInteraction; #endif diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h index 13d0eb323a..28257fe29f 100644 --- a/src/widgets/widgets/qtextedit_p.h +++ b/src/widgets/widgets/qtextedit_p.h @@ -54,7 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" +#if QT_CONFIG(scrollbar) #include "QtWidgets/qscrollbar.h" +#endif #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" #include "QtWidgets/qmenu.h" diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 476f9d4cfa..e162d46935 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -55,6 +55,7 @@ #endif #include <qsignalmapper.h> #include <qstylepainter.h> +#include <qstyleoption.h> #include <qtoolbutton.h> #include <qwidgetaction.h> #include <qtimer.h> diff --git a/src/widgets/widgets/qtoolbarextension.cpp b/src/widgets/widgets/qtoolbarextension.cpp index 267e220b8f..47cf16e0cc 100644 --- a/src/widgets/widgets/qtoolbarextension.cpp +++ b/src/widgets/widgets/qtoolbarextension.cpp @@ -43,8 +43,6 @@ #include <qstylepainter.h> #include <qstyleoption.h> -#ifndef QT_NO_TOOLBUTTON - QT_BEGIN_NAMESPACE QToolBarExtension::QToolBarExtension(QWidget *parent) @@ -88,5 +86,3 @@ QSize QToolBarExtension::sizeHint() const QT_END_NAMESPACE #include "moc_qtoolbarextension_p.cpp" - -#endif // QT_NO_TOOLBUTTON diff --git a/src/widgets/widgets/qtoolbarextension_p.h b/src/widgets/widgets/qtoolbarextension_p.h index c4d803165c..b6223107c4 100644 --- a/src/widgets/widgets/qtoolbarextension_p.h +++ b/src/widgets/widgets/qtoolbarextension_p.h @@ -54,9 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qtoolbutton.h" -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(toolbutton); -#ifndef QT_NO_TOOLBUTTON +QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QToolBarExtension : public QToolButton { @@ -71,8 +71,6 @@ public Q_SLOTS: void setOrientation(Qt::Orientation o); }; -#endif // QT_NO_TOOLBUTTON - QT_END_NAMESPACE #endif // QDYNAMICTOOLBAREXTENSION_P_H diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp index 39e61a1951..118cb2ae61 100644 --- a/src/widgets/widgets/qtoolbarlayout.cpp +++ b/src/widgets/widgets/qtoolbarlayout.cpp @@ -42,7 +42,9 @@ #include <qwidgetaction.h> #include <qtoolbar.h> #include <qstyleoption.h> +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #include <qmenu.h> #include <qdebug.h> #include <qmath.h> @@ -51,7 +53,9 @@ #endif #include "qmainwindowlayout_p.h" +#if QT_CONFIG(toolbutton) #include "qtoolbarextension_p.h" +#endif #include "qtoolbarlayout_p.h" #include "qtoolbarseparator_p.h" diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp index 8413827e30..fdcd07eb06 100644 --- a/src/widgets/widgets/qtoolbox.cpp +++ b/src/widgets/widgets/qtoolbox.cpp @@ -39,8 +39,6 @@ #include "qtoolbox.h" -#ifndef QT_NO_TOOLBOX - #include <qapplication.h> #include <qeventloop.h> #include <qlayout.h> @@ -734,5 +732,3 @@ QT_END_NAMESPACE #include "moc_qtoolbox.cpp" #include "qtoolbox.moc" - -#endif //QT_NO_TOOLBOX diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index 6556d8a202..321507ba07 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -44,10 +44,9 @@ #include <QtWidgets/qframe.h> #include <QtGui/qicon.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(toolbox); -#ifndef QT_NO_TOOLBOX +QT_BEGIN_NAMESPACE class QToolBoxPrivate; @@ -119,8 +118,6 @@ inline int QToolBox::addItem(QWidget *item, const QIcon &iconSet, inline int QToolBox::insertItem(int index, QWidget *item, const QString &text) { return insertItem(index, item, QIcon(), text); } -#endif // QT_NO_TOOLBOX - QT_END_NAMESPACE #endif // QTOOLBOX_H diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 13595575e6..f2c5814203 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qtoolbutton.h" -#ifndef QT_NO_TOOLBUTTON #include <qapplication.h> #include <qdesktopwidget.h> @@ -985,5 +984,3 @@ bool QToolButton::event(QEvent *event) QT_END_NAMESPACE #include "moc_qtoolbutton.cpp" - -#endif diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index e2470524da..7ba9a18fef 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -42,12 +42,11 @@ #include <QtWidgets/qtwidgetsglobal.h> -#if QT_CONFIG(toolbutton) - #include <QtWidgets/qabstractbutton.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(toolbutton); +QT_BEGIN_NAMESPACE class QToolButtonPrivate; class QMenu; @@ -137,6 +136,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(toolbutton) - #endif // QTOOLBUTTON_H diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 9555ccc5b6..9281cc8ced 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -53,7 +53,7 @@ #endif #include "qapplication.h" -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) #include "qgraphicssceneevent.h" #endif diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index b9340c0aff..257402e9dc 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -250,6 +250,11 @@ public: QString displayText() const { return m_textLayout.text(); } + QString surroundingText() const + { + return m_text.isNull() ? QString::fromLatin1("") : m_text; + } + void backspace(); void del(); void deselect() { internalDeselect(); finishChange(); } diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 116855c8d3..706e63bbdc 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -58,7 +58,9 @@ #include "private/qtextdocument_p.h" #include "qtextlist.h" #include "private/qwidgettextcontrol_p.h" +#if QT_CONFIG(graphicsview) #include "qgraphicssceneevent.h" +#endif #include "qpagedpaintdevice.h" #include "private/qpagedpaintdevice_p.h" #include "qtextdocumentwriter.h" @@ -986,7 +988,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget if (!d->contextWidget) { switch (e->type()) { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMouseMove: case QEvent::GraphicsSceneMousePress: case QEvent::GraphicsSceneMouseRelease: @@ -1004,7 +1006,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget d->contextWidget = ev->widget(); break; } -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) default: break; }; } @@ -1083,7 +1085,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget } #endif -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMousePress: { QGraphicsSceneMouseEvent *ev = static_cast<QGraphicsSceneMouseEvent *>(e); d->mousePressEvent(ev, ev->button(), matrix.map(ev->pos()), ev->modifiers(), ev->buttons(), @@ -1133,7 +1135,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget if (d->dropEvent(ev->mimeData(), matrix.map(ev->pos()), ev->dropAction(), ev->source())) ev->accept(); break; } -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) #ifdef QT_KEYPAD_NAVIGATION case QEvent::EnterEditFocus: case QEvent::LeaveEditFocus: diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h index 357ffdc6bd..3917752d19 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h @@ -53,7 +53,6 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtGui/qtextdocumentfragment.h" -#include "QtWidgets/qscrollbar.h" #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" #include "QtWidgets/qmenu.h" diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index aed3f53478..c204dad08d 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -5,10 +5,8 @@ HEADERS += \ widgets/qbuttongroup_p.h \ widgets/qabstractspinbox.h \ widgets/qabstractspinbox_p.h \ - widgets/qdial.h \ widgets/qframe.h \ widgets/qframe_p.h \ - widgets/qgroupbox.h \ widgets/qkeysequenceedit.h \ widgets/qkeysequenceedit_p.h \ widgets/qlineedit.h \ @@ -23,27 +21,17 @@ HEADERS += \ widgets/qmenu_p.h \ widgets/qmenubar.h \ widgets/qmenubar_p.h \ - widgets/qprogressbar.h \ - widgets/qscrollbar.h \ - widgets/qscrollbar_p.h \ widgets/qscrollarea_p.h \ widgets/qsizegrip.h \ widgets/qslider.h \ widgets/qspinbox.h \ - widgets/qsplitter.h \ - widgets/qsplitter_p.h \ widgets/qstackedwidget.h \ - widgets/qstatusbar.h \ widgets/qtextedit.h \ widgets/qtextedit_p.h \ - widgets/qtextbrowser.h \ widgets/qtoolbar.h \ widgets/qtoolbar_p.h \ widgets/qtoolbarlayout_p.h \ - widgets/qtoolbarextension_p.h \ widgets/qtoolbarseparator_p.h \ - widgets/qtoolbox.h \ - widgets/qtoolbutton.h \ widgets/qabstractscrollarea.h \ widgets/qabstractscrollarea_p.h \ widgets/qwidgetresizehandler_p.h \ @@ -58,10 +46,8 @@ HEADERS += \ SOURCES += \ widgets/qbuttongroup.cpp \ widgets/qabstractspinbox.cpp \ - widgets/qdial.cpp \ widgets/qeffects.cpp \ widgets/qframe.cpp \ - widgets/qgroupbox.cpp \ widgets/qkeysequenceedit.cpp \ widgets/qlineedit_p.cpp \ widgets/qlineedit.cpp \ @@ -71,22 +57,14 @@ SOURCES += \ widgets/qmdisubwindow.cpp \ widgets/qmenu.cpp \ widgets/qmenubar.cpp \ - widgets/qprogressbar.cpp \ - widgets/qscrollbar.cpp \ widgets/qsizegrip.cpp \ widgets/qslider.cpp \ widgets/qspinbox.cpp \ - widgets/qsplitter.cpp \ widgets/qstackedwidget.cpp \ - widgets/qstatusbar.cpp \ widgets/qtextedit.cpp \ - widgets/qtextbrowser.cpp \ widgets/qtoolbar.cpp \ widgets/qtoolbarlayout.cpp \ - widgets/qtoolbarextension.cpp \ widgets/qtoolbarseparator.cpp \ - widgets/qtoolbox.cpp \ - widgets/qtoolbutton.cpp \ widgets/qabstractscrollarea.cpp \ widgets/qwidgetresizehandler.cpp \ widgets/qfocusframe.cpp \ @@ -152,6 +130,11 @@ qtConfig(datetimeedit) { widgets/qdatetimeedit.cpp } +qtConfig(dial) { + HEADERS += widgets/qdial.h + SOURCES += widgets/qdial.cpp +} + qtConfig(dockwidget) { HEADERS += \ widgets/qdockwidget.h \ @@ -168,6 +151,11 @@ qtConfig(fontcombobox) { SOURCES += widgets/qfontcombobox.cpp } +qtConfig(groupbox) { + HEADERS += widgets/qgroupbox.h + SOURCES += widgets/qgroupbox.cpp +} + qtConfig(label) { HEADERS += \ widgets/qlabel.h \ @@ -185,6 +173,11 @@ qtConfig(lcdnumber) { widgets/qlcdnumber.cpp } +qtConfig(progressbar) { + HEADERS += widgets/qprogressbar.h + SOURCES += widgets/qprogressbar.cpp +} + qtConfig(pushbutton) { HEADERS += \ widgets/qpushbutton.h \ @@ -215,6 +208,14 @@ qtConfig(rubberband) { SOURCES += widgets/qrubberband.cpp } +qtConfig(scrollbar) { + HEADERS += \ + widgets/qscrollbar.h \ + widgets/qscrollbar_p.h + + SOURCES += widgets/qscrollbar.cpp +} + qtConfig(splashscreen) { HEADERS += \ widgets/qsplashscreen.h @@ -223,6 +224,19 @@ qtConfig(splashscreen) { widgets/qsplashscreen.cpp } +qtConfig(splitter) { + HEADERS += \ + widgets/qsplitter.h \ + widgets/qsplitter_p.h + + SOURCES += widgets/qsplitter.cpp +} + +qtConfig(statusbar) { + HEADERS += widgets/qstatusbar.h + SOURCES += widgets/qstatusbar.cpp +} + qtConfig(tabbar) { HEADERS += \ widgets/qtabbar.h \ @@ -231,11 +245,31 @@ qtConfig(tabbar) { SOURCES += widgets/qtabbar.cpp } +qtConfig(textbrowser) { + HEADERS += widgets/qtextbrowser.h + SOURCES += widgets/qtextbrowser.cpp +} + qtConfig(tabwidget) { HEADERS += widgets/qtabwidget.h SOURCES += widgets/qtabwidget.cpp } +qtConfig(toolbox) { + HEADERS += widgets/qtoolbox.h + SOURCES += widgets/qtoolbox.cpp +} + +qtConfig(toolbutton) { + HEADERS += \ + widgets/qtoolbutton.h \ + widgets/qtoolbarextension_p.h + + SOURCES += \ + widgets/qtoolbutton.cpp \ + widgets/qtoolbarextension.cpp +} + qtConfig(widgettextcontrol) { HEADERS += \ widgets/qwidgettextcontrol_p.h \ |