Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ia082e20e2eb4b76afd4c1a1584ff4e5514655d7a

41 files changed, 260 insertions, 200 deletions

diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index 9af4fd9133..edb9bb9098 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -1502,30 +1502,40 @@ bool QItemSelectionModel::isRowSelected(int row, const QModelIndex &parent) cons
                         && d->currentSelection.at(i).intersected(d->ranges.at(j)).isValid())
                         return false;
     }
+
+    auto isSelectable = [&](int row, int column) {
+        Qt::ItemFlags flags = d->model->index(row, column, parent).flags();
+        return (flags & Qt::ItemIsSelectable);
+    };
+
+    const int colCount = d->model->columnCount(parent);
+    int unselectable = 0;
     // add ranges and currentSelection and check through them all
     QList<QItemSelectionRange>::const_iterator it;
     QList<QItemSelectionRange> joined = d->ranges;
     if (d->currentSelection.count())
         joined += d->currentSelection;
-    int colCount = d->model->columnCount(parent);
     for (int column = 0; column < colCount; ++column) {
+        if (!isSelectable(row, column)) {
+            ++unselectable;
+            continue;
+        }
+
         for (it = joined.constBegin(); it != joined.constEnd(); ++it) {
             if ((*it).contains(row, column, parent)) {
-                bool selectable = false;
-                for (int i = column; !selectable && i <= (*it).right(); ++i) {
-                    Qt::ItemFlags flags = d->model->index(row, i, parent).flags();
-                    selectable = flags & Qt::ItemIsSelectable;
-                }
-                if (selectable){
-                    column = qMax(column, (*it).right());
-                    break;
+                for (int i = column; i <= (*it).right(); ++i) {
+                    if (!isSelectable(row, i))
+                        ++unselectable;
                 }
+
+                column = qMax(column, (*it).right());
+                break;
             }
         }
         if (it == joined.constEnd())
             return false;
     }
-    return colCount > 0; // no columns means no selected items
+    return unselectable < colCount;
 }
 
 /*!
@@ -1568,26 +1578,39 @@ bool QItemSelectionModel::isColumnSelected(int column, const QModelIndex &parent
             }
         }
     }
+
+    auto isSelectable = [&](int row, int column) {
+        Qt::ItemFlags flags = d->model->index(row, column, parent).flags();
+        return (flags & Qt::ItemIsSelectable);
+    };
+    const int rowCount = d->model->rowCount(parent);
+    int unselectable = 0;
+
     // add ranges and currentSelection and check through them all
     QList<QItemSelectionRange>::const_iterator it;
     QList<QItemSelectionRange> joined = d->ranges;
     if (d->currentSelection.count())
         joined += d->currentSelection;
-    int rowCount = d->model->rowCount(parent);
     for (int row = 0; row < rowCount; ++row) {
-         for (it = joined.constBegin(); it != joined.constEnd(); ++it) {
-             if ((*it).contains(row, column, parent)) {
-                 Qt::ItemFlags flags = d->model->index(row, column, parent).flags();
-                 if ((flags & Qt::ItemIsSelectable) && (flags & Qt::ItemIsEnabled)) {
-                     row = qMax(row, (*it).bottom());
-                     break;
-                 }
-             }
-         }
-         if (it == joined.constEnd())
-             return false;
+        if (!isSelectable(row, column)) {
+            ++unselectable;
+            continue;
+        }
+        for (it = joined.constBegin(); it != joined.constEnd(); ++it) {
+            if ((*it).contains(row, column, parent)) {
+                for (int i = row; i <= (*it).bottom(); ++i) {
+                    if (!isSelectable(i, column)) {
+                        ++unselectable;
+                    }
+                }
+                row = qMax(row, (*it).bottom());
+                break;
+            }
+        }
+        if (it == joined.constEnd())
+            return false;
     }
-    return rowCount > 0; // no rows means no selected items
+    return unselectable < rowCount;
 }
 
 /*!
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp
index 7d529372c4..68e3c8f10d 100644
--- a/src/corelib/mimetypes/qmimedatabase.cpp
+++ b/src/corelib/mimetypes/qmimedatabase.cpp
@@ -311,9 +311,9 @@ static inline bool isTextFile(const QByteArray &data)
     if (data.startsWith(bigEndianBOM) || data.startsWith(littleEndianBOM))
         return true;
 
-    // Check the first 32 bytes (see shared-mime spec)
+    // Check the first 128 bytes (see shared-mime spec)
     const char *p = data.constData();
-    const char *e = p + qMin(32, data.size());
+    const char *e = p + qMin(128, data.size());
     for ( ; p < e; ++p) {
         if ((unsigned char)(*p) < 32 && *p != 9 && *p !=10 && *p != 13)
             return false;
diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp
index 930c3bd2da..eb8f61c783 100644
--- a/src/dbus/qdbusmisc.cpp
+++ b/src/dbus/qdbusmisc.cpp
@@ -181,6 +181,13 @@ int qDBusParametersForMethod(const QList<QByteArray> &parameterTypes, QVector<in
         }
 
         int id = QMetaType::type(type);
+#ifdef QT_BOOTSTRAPPED
+        // in bootstrap mode QDBusMessage isn't included, thus we need to resolve it manually here
+        if (type == "QDBusMessage") {
+            id = QDBusMetaTypeId::message();
+        }
+#endif
+
         if (id == QMetaType::UnknownType) {
             errorMsg = QLatin1String("Unregistered input type in parameter list: ") + QLatin1String(type);
             return -1;
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 07644b869f..35e79a69f2 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -178,7 +178,9 @@ static void ensureInitialized()
     it sends. It contains the proxy and cache configuration, as well as the
     signals related to such issues, and reply signals that can be used to
     monitor the progress of a network operation. One QNetworkAccessManager
-    should be enough for the whole Qt application.
+    instance should be enough for the whole Qt application. Since
+    QNetworkAccessManager is based on QObject, it can only be used from the
+    thread it belongs to.
 
     Once a QNetworkAccessManager object has been created, the application can
     use it to send requests over the network. A group of standard functions
diff --git a/src/network/access/qnetworkcookiejar.cpp b/src/network/access/qnetworkcookiejar.cpp
index f62a03b11d..2ec4acf26c 100644
--- a/src/network/access/qnetworkcookiejar.cpp
+++ b/src/network/access/qnetworkcookiejar.cpp
@@ -241,6 +241,17 @@ QList<QNetworkCookie> QNetworkCookieJar::cookiesForUrl(const QUrl &url) const
         if ((*it).isSecure() && !isEncrypted)
             continue;
 
+        QString domain = it->domain();
+        if (domain.startsWith(QLatin1Char('.'))) /// Qt6?: remove when compliant with RFC6265
+            domain = domain.mid(1);
+#if QT_CONFIG(topleveldomain)
+        if (qIsEffectiveTLD(domain) && url.host() != domain)
+            continue;
+#else
+        if (!domain.contains(QLatin1Char('.')) && url.host() != domain)
+            continue;
+#endif // topleveldomain
+
         // insert this cookie into result, sorted by path
         QList<QNetworkCookie>::Iterator insertIt = result.begin();
         while (insertIt != result.end()) {
@@ -340,6 +351,11 @@ bool QNetworkCookieJar::validateCookie(const QNetworkCookie &cookie, const QUrl
     if (domain.startsWith(QLatin1Char('.')))
         domain = domain.mid(1);
 
+    // We shouldn't reject if:
+    // "[...] the domain-attribute is identical to the canonicalized request-host"
+    // https://tools.ietf.org/html/rfc6265#section-5.3 step 5
+    if (host == domain)
+        return true;
 #if QT_CONFIG(topleveldomain)
     // the check for effective TLDs makes the "embedded dot" rule from RFC 2109 section 4.3.2
     // redundant; the "leading dot" rule has been relaxed anyway, see QNetworkCookie::normalize()
diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
index b14cf6d3ee..87a57c78c8 100644
--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
@@ -314,6 +314,7 @@ NSCursor *QCocoaCursor::createCursorFromPixmap(const QPixmap pixmap, const QPoin
     if (pixmap.devicePixelRatio() > 1.0) {
         QSize layoutSize = pixmap.size() / pixmap.devicePixelRatio();
         QPixmap scaledPixmap = pixmap.scaled(layoutSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        scaledPixmap.setDevicePixelRatio(1.0);
         nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(scaledPixmap));
         CGImageRef cgImage = qt_mac_toCGImage(pixmap.toImage());
         NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];
diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h
index 4eac0a59d6..8c712e838a 100644
--- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h
+++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h
@@ -110,7 +110,9 @@
 #include <qstyleoption.h>
 #include <qtextedit.h>
 #include <qtextstream.h>
+#if QT_CONFIG(toolbar)
 #include <qtoolbar.h>
+#endif
 #if QT_CONFIG(toolbutton)
 #include <qtoolbutton.h>
 #endif
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h b/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h
index b649426811..d66b17e9f8 100644
--- a/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h
+++ b/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h
@@ -75,7 +75,9 @@
 #if QT_CONFIG(spinbox)
 #include <qspinbox.h>
 #endif
+#if QT_CONFIG(toolbar)
 #include <qtoolbar.h>
+#endif
 #if QT_CONFIG(combobox)
 #include <qcombobox.h>
 #endif
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
index ddd8a76cfd..e690a424ac 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
@@ -79,7 +79,9 @@
 #if QT_CONFIG(pushbutton)
 #include <qpushbutton.h>
 #endif
+#if QT_CONFIG(toolbar)
 #include <qtoolbar.h>
+#endif
 #include <qlabel.h>
 #include <qvarlengtharray.h>
 #include <qdebug.h>
@@ -3315,12 +3317,12 @@ int QWindowsXPStyle::pixelMetric(PixelMetric pm, const QStyleOption *option, con
         res = 160;
         break;
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     case PM_ToolBarHandleExtent:
         res = int(QStyleHelper::dpiScaled(8.));
         break;
 
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
     case PM_DockWidgetSeparatorExtent:
     case PM_DockWidgetTitleMargin:
         res = int(QStyleHelper::dpiScaled(4.));
diff --git a/src/printsupport/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp
index 71b5500bab..1a2aa7afac 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.cpp
+++ b/src/printsupport/dialogs/qabstractprintdialog.cpp
@@ -45,11 +45,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// hack
-class QPrintDialogPrivate : public QAbstractPrintDialogPrivate
-{
-};
-
 /*!
     \class QAbstractPrintDialog
     \brief The QAbstractPrintDialog class provides a base implementation for
@@ -145,7 +140,7 @@ QAbstractPrintDialog::~QAbstractPrintDialog()
 */
 void QPrintDialog::setOption(PrintDialogOption option, bool on)
 {
-    Q_D(QPrintDialog);
+    auto *d = static_cast<QAbstractPrintDialogPrivate *>(d_ptr.data());
     if (!(d->options & option) != !on)
         setOptions(d->options ^ option);
 }
@@ -158,7 +153,7 @@ void QPrintDialog::setOption(PrintDialogOption option, bool on)
 */
 bool QPrintDialog::testOption(PrintDialogOption option) const
 {
-    Q_D(const QPrintDialog);
+    auto *d = static_cast<const QAbstractPrintDialogPrivate *>(d_ptr.data());
     return (d->options & option) != 0;
 }
 
@@ -177,7 +172,7 @@ bool QPrintDialog::testOption(PrintDialogOption option) const
 */
 void QPrintDialog::setOptions(PrintDialogOptions options)
 {
-    Q_D(QPrintDialog);
+    auto *d = static_cast<QAbstractPrintDialogPrivate *>(d_ptr.data());
 
     PrintDialogOptions changed = (options ^ d->options);
     if (!changed)
@@ -188,7 +183,7 @@ void QPrintDialog::setOptions(PrintDialogOptions options)
 
 QPrintDialog::PrintDialogOptions QPrintDialog::options() const
 {
-    Q_D(const QPrintDialog);
+    auto *d = static_cast<const QAbstractPrintDialogPrivate *>(d_ptr.data());
     return d->options;
 }
 
@@ -464,7 +459,7 @@ void QAbstractPrintDialog::setOptionTabs(const QList<QWidget*> &tabs)
 */
 void QPrintDialog::done(int result)
 {
-    Q_D(QPrintDialog);
+    auto *d = static_cast<QAbstractPrintDialogPrivate *>(d_ptr.data());
     QDialog::done(result);
     if (result == Accepted)
         emit accepted(printer());
@@ -487,7 +482,7 @@ void QPrintDialog::done(int result)
 */
 void QPrintDialog::open(QObject *receiver, const char *member)
 {
-    Q_D(QPrintDialog);
+    auto *d = static_cast<QAbstractPrintDialogPrivate *>(d_ptr.data());
     connect(this, SIGNAL(accepted(QPrinter*)), receiver, member);
     d->receiverToDisconnectOnClose = receiver;
     d->memberToDisconnectOnClose = member;
diff --git a/src/printsupport/dialogs/qabstractprintdialog_p.h b/src/printsupport/dialogs/qabstractprintdialog_p.h
index a17a28f564..b646b74f34 100644
--- a/src/printsupport/dialogs/qabstractprintdialog_p.h
+++ b/src/printsupport/dialogs/qabstractprintdialog_p.h
@@ -69,16 +69,15 @@ class QAbstractPrintDialogPrivate : public QDialogPrivate
 
 public:
     QAbstractPrintDialogPrivate()
-        : printer(nullptr), pd(nullptr), ownsPrinter(false)
+        : printer(nullptr), pd(nullptr)
         , options(QAbstractPrintDialog::PrintToFile | QAbstractPrintDialog::PrintPageRange |
                 QAbstractPrintDialog::PrintCollateCopies | QAbstractPrintDialog::PrintShowPageSize),
-          minPage(0), maxPage(INT_MAX)
+          minPage(0), maxPage(INT_MAX), ownsPrinter(false)
     {
     }
 
     QPrinter *printer;
     QPrinterPrivate *pd;
-    bool ownsPrinter;
     QPointer<QObject> receiverToDisconnectOnClose;
     QByteArray memberToDisconnectOnClose;
 
@@ -88,6 +87,8 @@ public:
     void setPrinter(QPrinter *newPrinter);
     int minPage;
     int maxPage;
+
+    bool ownsPrinter;
 };
 
 QT_END_NAMESPACE
diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index 8a5b863bb5..595ff3eb6e 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -1559,8 +1559,6 @@ QFormLayout::TakeRowResult QFormLayout::takeRow(int row)
     QFormLayoutItem *label = d->m_matrix(row, 0);
     QFormLayoutItem *field = d->m_matrix(row, 1);
 
-    Q_ASSERT(field);
-
     d->m_things.removeOne(label);
     d->m_things.removeOne(field);
     d->m_matrix.removeRow(row);
diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index 64acd8d229..80ea27fee8 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -44,7 +44,9 @@
 #if QT_CONFIG(menubar)
 #include "qmenubar.h"
 #endif
+#if QT_CONFIG(toolbar)
 #include "qtoolbar.h"
+#endif
 #if QT_CONFIG(sizegrip)
 #include "qsizegrip.h"
 #endif
diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index 52640daf55..25890e888b 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -44,7 +44,9 @@
 #if QT_CONFIG(menubar)
 #include "qmenubar.h"
 #endif
+#if QT_CONFIG(toolbar)
 #include "qtoolbar.h"
+#endif
 #include "qevent.h"
 #include "qstyle.h"
 #include "qvariant.h"
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index e33a891d74..fd76c8b69e 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -237,6 +237,7 @@ bool QWidgetWindow::event(QEvent *event)
     switch (event->type()) {
     case QEvent::Close:
         handleCloseEvent(static_cast<QCloseEvent *>(event));
+        QWindow::event(event);
         return true;
 
     case QEvent::Enter:
diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp
index b452c63551..130260704f 100644
--- a/src/widgets/statemachine/qguistatemachine.cpp
+++ b/src/widgets/statemachine/qguistatemachine.cpp
@@ -251,10 +251,10 @@ static QEvent *cloneEvent(QEvent *e)
         return new QWhatsThisClickedEvent(*static_cast<QWhatsThisClickedEvent*>(e));
 #endif // QT_CONFIG(whatsthis)
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     case QEvent::ToolBarChange:
         return new QToolBarChangeEvent(*static_cast<QToolBarChangeEvent*>(e));
-#endif //QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
     case QEvent::ApplicationActivate:
         return new QEvent(*e);
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index ce76748347..f083359c06 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -81,7 +81,9 @@
 #if QT_CONFIG(tabwidget)
 #include <qtabwidget.h>
 #endif
+#if QT_CONFIG(toolbar)
 #include <qtoolbar.h>
+#endif
 #if QT_CONFIG(toolbutton)
 #include <qtoolbutton.h>
 #endif
@@ -276,7 +278,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
             }
         }
         break;
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     case PE_PanelMenuBar:
         if (widget && qobject_cast<QToolBar *>(widget->parentWidget()))
             break;
@@ -295,7 +297,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
         break;
     case PE_PanelToolBar:
        break;
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 #if QT_CONFIG(progressbar)
     case PE_IndicatorProgressChunk:
         {
@@ -477,7 +479,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
         }
         break;
 #endif // QT_CONFIG(dockwidget)
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     case PE_IndicatorToolBarHandle:
         p->save();
         p->translate(opt->rect.x(), opt->rect.y());
@@ -515,7 +517,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
             qDrawShadeLine(p, p1, p2, opt->palette, 1, 1, 0);
             break;
         }
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 #if QT_CONFIG(spinbox)
     case PE_IndicatorSpinPlus:
     case PE_IndicatorSpinMinus: {
@@ -2153,7 +2155,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
         }
         break;
 #endif // QT_CONFIG(combobox)
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     case CE_ToolBar:
         if (const QStyleOptionToolBar *toolBar = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) {
             // Compatibility with styles that use PE_PanelToolBar
@@ -2169,7 +2171,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
                             &toolBar->palette.brush(QPalette::Button));
         }
         break;
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
     case CE_ColumnViewGrip: {
         // draw background gradients
         QLinearGradient g(0, 0, opt->rect.width(), 0);
@@ -3072,7 +3074,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
                                }
         break;
 #endif // QT_CONFIG(itemviews)
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     case SE_ToolBarHandle:
         if (const QStyleOptionToolBar *tbopt = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) {
             if (tbopt->features & QStyleOptionToolBar::Movable) {
@@ -3090,7 +3092,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
             }
         }
         break;
-#endif //QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
     default:
         break;
     }
@@ -4570,7 +4572,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         ret = 0;
         break;
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     case PM_ToolBarFrameWidth:
         ret = 1;
         break;
@@ -4594,7 +4596,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
     case PM_ToolBarExtensionExtent:
         ret = int(QStyleHelper::dpiScaled(12.));
         break;
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
 #if QT_CONFIG(tabbar)
     case PM_TabBarTabOverlap:
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 774c039ecc..97631a5841 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -1040,7 +1040,7 @@ QStyleOptionButton::QStyleOptionButton(int version)
 */
 
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
 /*!
     \class QStyleOptionToolBar
     \brief The QStyleOptionToolBar class is used to describe the
diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h
index 241399543b..8ae07efc81 100644
--- a/src/widgets/styles/qstyleoption.h
+++ b/src/widgets/styles/qstyleoption.h
@@ -296,7 +296,7 @@ typedef Q_DECL_DEPRECATED QStyleOptionTab QStyleOptionTabV3;
 #endif // QT_CONFIG(tabbar)
 
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
 
 class Q_WIDGETS_EXPORT QStyleOptionToolBar : public QStyleOption
 {
@@ -321,7 +321,7 @@ protected:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionToolBar::ToolBarFeatures)
 
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
 class Q_WIDGETS_EXPORT QStyleOptionProgressBar : public QStyleOption
 {
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 98f2b8df2d..8340ac086a 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -111,7 +111,9 @@
 #include "qdrawutil.h"
 
 #include <limits.h>
+#if QT_CONFIG(toolbar)
 #include <QtWidgets/qtoolbar.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -1979,7 +1981,7 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, const QStyleOption
             if (frm->features & QStyleOptionFrame::Flat)
                 extraClass |= PseudoClass_Flat;
         }
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
         else if (const QStyleOptionToolBar *tb = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) {
             if (tb->toolBarArea == Qt::LeftToolBarArea)
                 extraClass |= PseudoClass_Left;
@@ -1999,7 +2001,7 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, const QStyleOption
             else if (tb->positionWithinLine == QStyleOptionToolBar::OnlyOne)
                 extraClass |= PseudoClass_OnlyOne;
         }
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 #if QT_CONFIG(toolbox)
         else if (const QStyleOptionToolBox *tb = qstyleoption_cast<const QStyleOptionToolBox *>(opt)) {
             if (tb->position == QStyleOptionToolBox::OnlyOneTab)
@@ -3594,13 +3596,13 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
         if (rule.hasBorder()) {
             rule.drawBorder(p, rule.borderRect(opt->rect));
         } else {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
             if (const QStyleOptionToolBar *tb = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) {
                 QStyleOptionToolBar newTb(*tb);
                 newTb.rect = rule.borderRect(opt->rect);
                 baseStyle()->drawControl(ce, &newTb, p, w);
             }
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
         }
         return;
 
@@ -5946,12 +5948,12 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c
         return positionRect(w, subRule, subRule2, pe, opt->rect, opt->direction);
                                    }
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     case SE_ToolBarHandle:
         if (hasStyleRule(w, PseudoElement_ToolBarHandle))
             return ParentStyle::subElementRect(se, opt, w);
         break;
-#endif //QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
     // On mac we make pixel adjustments to layouts which are not
     // desireable when you have custom style sheets on them
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index 89011350ec..7c9d917784 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -661,7 +661,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
     bool doRestore = false;
 
     switch (pe) {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
   case PE_IndicatorToolBarSeparator:
         {
             QRect rect = opt->rect;
@@ -721,7 +721,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt,
         p->restore();
         break;
 
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
     case PE_FrameButtonTool:
     case PE_PanelButtonTool: {
         QPen oldPen = p->pen();
@@ -1572,7 +1572,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
             p->fillRect(opt->rect, fill);
         }
         break; }
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     case CE_ToolBar:
         if (const QStyleOptionToolBar *toolbar = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) {
             // Reserve the beveled appearance only for mainwindow toolbars
@@ -1673,7 +1673,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
         break;
 
 
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
     case CE_ProgressBarContents:
         if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) {
diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
index 9c216738c0..3026a5b7d6 100644
--- a/src/widgets/widgets/qdockarealayout.cpp
+++ b/src/widgets/widgets/qdockarealayout.cpp
@@ -53,6 +53,7 @@
 #include "qmainwindow.h"
 #include "qwidgetanimator_p.h"
 #include "qmainwindowlayout_p.h"
+#include "qmenu_p.h"
 #include "qdockwidget_p.h"
 #include <private/qlayoutengine_p.h>
 
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index bf0a88e7fb..2014bdabf3 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -45,7 +45,9 @@
 #if QT_CONFIG(dockwidget)
 #include "qdockwidget.h"
 #endif
+#if QT_CONFIG(toolbar)
 #include "qtoolbar.h"
+#endif
 
 #include <qapplication.h>
 #include <qmenu.h>
@@ -61,7 +63,9 @@
 #include <qpainter.h>
 
 #include <private/qwidget_p.h>
+#if QT_CONFIG(toolbar)
 #include "qtoolbar_p.h"
+#endif
 #include "qwidgetanimator_p.h"
 #ifdef Q_OS_OSX
 #include <qpa/qplatformnativeinterface.h>
@@ -706,7 +710,7 @@ Qt::DockWidgetArea QMainWindow::corner(Qt::Corner corner) const
 { return d_func()->layout->corner(corner); }
 #endif
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
 
 static bool checkToolBarArea(Qt::ToolBarArea area, const char *where)
 {
@@ -874,7 +878,7 @@ bool QMainWindow::toolBarBreak(QToolBar *toolbar) const
     return d_func()->layout->toolBarBreak(toolbar);
 }
 
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
 #if QT_CONFIG(dockwidget)
 
@@ -1312,7 +1316,7 @@ bool QMainWindow::event(QEvent *event)
         return true;
     switch (event->type()) {
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
         case QEvent::ToolBarChange: {
             d->layout->toggleToolBarsVisible();
             return true;
@@ -1344,7 +1348,7 @@ bool QMainWindow::event(QEvent *event)
     return QWidget::event(event);
 }
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
 
 /*!
     \property QMainWindow::unifiedTitleAndToolBarOnMac
@@ -1389,7 +1393,7 @@ bool QMainWindow::unifiedTitleAndToolBarOnMac() const
     return false;
 }
 
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
 /*!
     \internal
@@ -1435,7 +1439,7 @@ void QMainWindow::contextMenuEvent(QContextMenuEvent *event)
             break;
         }
 #endif // QT_CONFIG(dockwidget)
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
         if (QToolBar *tb = qobject_cast<QToolBar *>(child)) {
             if (tb->parentWidget() != this)
                 return;
@@ -1506,7 +1510,7 @@ QMenu *QMainWindow::createPopupMenu()
         menu->addSeparator();
     }
 #endif // QT_CONFIG(dockwidget)
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     QList<QToolBar *> toolbars = findChildren<QToolBar *>();
     if (toolbars.size()) {
         if (!menu)
diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h
index 069683d4ac..8f2a192446 100644
--- a/src/widgets/widgets/qmainwindow.h
+++ b/src/widgets/widgets/qmainwindow.h
@@ -74,7 +74,7 @@ class Q_WIDGETS_EXPORT QMainWindow : public QWidget
     Q_PROPERTY(bool dockNestingEnabled READ isDockNestingEnabled WRITE setDockNestingEnabled)
 #endif // QT_CONFIG(dockwidget)
     Q_PROPERTY(DockOptions dockOptions READ dockOptions WRITE setDockOptions)
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     Q_PROPERTY(bool unifiedTitleAndToolBarOnMac READ unifiedTitleAndToolBarOnMac WRITE setUnifiedTitleAndToolBarOnMac)
 #endif
 
@@ -145,7 +145,7 @@ public:
     Qt::DockWidgetArea corner(Qt::Corner corner) const;
 #endif
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     void addToolBarBreak(Qt::ToolBarArea area = Qt::TopToolBarArea);
     void insertToolBarBreak(QToolBar *before);
 
@@ -190,7 +190,7 @@ public Q_SLOTS:
     void setAnimated(bool enabled);
     void setDockNestingEnabled(bool enabled);
 #endif
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     void setUnifiedTitleAndToolBarOnMac(bool set);
 #endif
 
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index 0082ce291e..053bfbf024 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -45,10 +45,12 @@
 #include "qdockwidget.h"
 #include "qdockwidget_p.h"
 #endif
+#if QT_CONFIG(toolbar)
 #include "qtoolbar_p.h"
-#include "qmainwindow.h"
 #include "qtoolbar.h"
 #include "qtoolbarlayout_p.h"
+#endif
+#include "qmainwindow.h"
 #include "qwidgetanimator_p.h"
 #if QT_CONFIG(rubberband)
 #include "qrubberband.h"
@@ -75,6 +77,7 @@
 #  include <qtextstream.h>
 #endif
 
+#include <private/qmenu_p.h>
 #include <private/qapplication_p.h>
 #include <private/qlayoutengine_p.h>
 #include <private/qwidgetresizehandler_p.h>
@@ -606,7 +609,7 @@ void QDockWidgetGroupWindow::apply()
 
 QMainWindowLayoutState::QMainWindowLayoutState(QMainWindow *win)
     :
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     toolBarAreaLayout(win),
 #endif
 #if QT_CONFIG(dockwidget)
@@ -631,9 +634,9 @@ QSize QMainWindowLayoutState::sizeHint() const
         result = centralWidgetItem->sizeHint();
 #endif
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     result = toolBarAreaLayout.sizeHint(result);
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
     return result;
 }
@@ -649,16 +652,16 @@ QSize QMainWindowLayoutState::minimumSize() const
         result = centralWidgetItem->minimumSize();
 #endif
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     result = toolBarAreaLayout.minimumSize(result);
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
     return result;
 }
 
 void QMainWindowLayoutState::apply(bool animated)
 {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     toolBarAreaLayout.apply(animated);
 #endif
 
@@ -677,12 +680,12 @@ void QMainWindowLayoutState::apply(bool animated)
 void QMainWindowLayoutState::fitLayout()
 {
     QRect r;
-#ifdef QT_NO_TOOLBAR
+#if !QT_CONFIG(toolbar)
     r = rect;
 #else
     toolBarAreaLayout.rect = rect;
     r = toolBarAreaLayout.fitLayout();
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
 #if QT_CONFIG(dockwidget)
     dockAreaLayout.rect = r;
@@ -694,7 +697,7 @@ void QMainWindowLayoutState::fitLayout()
 
 void QMainWindowLayoutState::deleteAllLayoutItems()
 {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     toolBarAreaLayout.deleteAllLayoutItems();
 #endif
 
@@ -716,7 +719,7 @@ void QMainWindowLayoutState::deleteCentralWidgetItem()
 
 QLayoutItem *QMainWindowLayoutState::itemAt(int index, int *x) const
 {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (QLayoutItem *ret = toolBarAreaLayout.itemAt(x, index))
         return ret;
 #endif
@@ -734,7 +737,7 @@ QLayoutItem *QMainWindowLayoutState::itemAt(int index, int *x) const
 
 QLayoutItem *QMainWindowLayoutState::takeAt(int index, int *x)
 {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (QLayoutItem *ret = toolBarAreaLayout.takeAt(x, index))
         return ret;
 #endif
@@ -757,7 +760,7 @@ QList<int> QMainWindowLayoutState::indexOf(QWidget *widget) const
 {
     QList<int> result;
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     // is it a toolbar?
     if (QToolBar *toolBar = qobject_cast<QToolBar*>(widget)) {
         result = toolBarAreaLayout.indexOf(toolBar);
@@ -792,7 +795,7 @@ bool QMainWindowLayoutState::contains(QWidget *widget) const
         return true;
 #endif
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (!toolBarAreaLayout.indexOf(widget).isEmpty())
         return true;
 #endif
@@ -835,7 +838,7 @@ QList<int> QMainWindowLayoutState::gapIndex(QWidget *widget,
 {
     QList<int> result;
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     // is it a toolbar?
     if (qobject_cast<QToolBar*>(widget) != 0) {
         result = toolBarAreaLayout.gapIndex(pos);
@@ -873,7 +876,7 @@ bool QMainWindowLayoutState::insertGap(const QList<int> &path, QLayoutItem *item
 
     int i = path.first();
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (i == 0) {
         Q_ASSERT(qobject_cast<QToolBar*>(item->widget()) != 0);
         return toolBarAreaLayout.insertGap(path.mid(1), item);
@@ -894,7 +897,7 @@ void QMainWindowLayoutState::remove(const QList<int> &path)
 {
     int i = path.first();
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (i == 0)
         toolBarAreaLayout.remove(path.mid(1));
 #endif
@@ -907,7 +910,7 @@ void QMainWindowLayoutState::remove(const QList<int> &path)
 
 void QMainWindowLayoutState::remove(QLayoutItem *item)
 {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     toolBarAreaLayout.remove(item);
 #endif
 
@@ -923,7 +926,7 @@ void QMainWindowLayoutState::remove(QLayoutItem *item)
 
 void QMainWindowLayoutState::clear()
 {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     toolBarAreaLayout.clear();
 #endif
 
@@ -945,7 +948,7 @@ QLayoutItem *QMainWindowLayoutState::item(const QList<int> &path)
 {
     int i = path.first();
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (i == 0) {
         const QToolBarAreaLayoutItem *tbItem = toolBarAreaLayout.item(path.mid(1));
         Q_ASSERT(tbItem);
@@ -965,7 +968,7 @@ QRect QMainWindowLayoutState::itemRect(const QList<int> &path) const
 {
     int i = path.first();
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (i == 0)
         return toolBarAreaLayout.itemRect(path.mid(1));
 #endif
@@ -982,7 +985,7 @@ QRect QMainWindowLayoutState::gapRect(const QList<int> &path) const
 {
     int i = path.first();
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (i == 0)
         return toolBarAreaLayout.itemRect(path.mid(1));
 #endif
@@ -999,7 +1002,7 @@ QLayoutItem *QMainWindowLayoutState::plug(const QList<int> &path)
 {
     int i = path.first();
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (i == 0)
         return toolBarAreaLayout.plug(path.mid(1));
 #endif
@@ -1016,7 +1019,7 @@ QLayoutItem *QMainWindowLayoutState::unplug(const QList<int> &path, QMainWindowL
 {
     int i = path.first();
 
-#ifdef QT_NO_TOOLBAR
+#if !QT_CONFIG(toolbar)
     Q_UNUSED(other);
 #else
     if (i == 0)
@@ -1047,7 +1050,7 @@ void QMainWindowLayoutState::saveState(QDataStream &stream) const
     }
 #endif
 #endif
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     toolBarAreaLayout.saveState(stream);
 #endif
 }
@@ -1094,7 +1097,7 @@ bool QMainWindowLayoutState::checkFormat(QDataStream &stream)
         stream >> marker;
         switch(marker)
         {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
             case QToolBarAreaLayout::ToolBarStateMarker:
             case QToolBarAreaLayout::ToolBarStateMarkerEx:
                 {
@@ -1104,7 +1107,7 @@ bool QMainWindowLayoutState::checkFormat(QDataStream &stream)
                     }
                 }
                 break;
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
 #if QT_CONFIG(dockwidget)
             case QDockAreaLayout::DockWidgetStateMarker:
@@ -1213,7 +1216,7 @@ bool QMainWindowLayoutState::restoreState(QDataStream &_stream,
 #endif // QT_CONFIG(tabwidget)
 #endif // QT_CONFIG(dockwidget)
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
             case QToolBarAreaLayout::ToolBarStateMarker:
             case QToolBarAreaLayout::ToolBarStateMarkerEx:
                 {
@@ -1234,7 +1237,7 @@ bool QMainWindowLayoutState::restoreState(QDataStream &_stream,
                     }
                 }
                 break;
-#endif //QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
             default:
                 return false;
         }// switch
@@ -1248,7 +1251,7 @@ bool QMainWindowLayoutState::restoreState(QDataStream &_stream,
 ** QMainWindowLayoutState - toolbars
 */
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
 
 static inline void validateToolBarArea(Qt::ToolBarArea &area)
 {
@@ -1423,7 +1426,7 @@ void QMainWindowLayout::toggleToolBarsVisible()
     }
 }
 
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
 /******************************************************************************
 ** QMainWindowLayoutState - dock areas
@@ -1907,7 +1910,7 @@ QLayoutItem *QMainWindowLayout::takeAt(int index)
             layoutState.remove(ret);
         }
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
         if (!currentGapPos.isEmpty() && currentGapPos.constFirst() == 0) {
             currentGapPos = layoutState.toolBarAreaLayout.currentGapIndex();
             if (!currentGapPos.isEmpty()) {
@@ -2019,7 +2022,7 @@ void QMainWindowLayout::setCurrentHoveredFloat(QDockWidgetGroupWindow *w)
 
 static void fixToolBarOrientation(QLayoutItem *item, int dockPos)
 {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     QToolBar *toolBar = qobject_cast<QToolBar*>(item->widget());
     if (toolBar == 0)
         return;
@@ -2148,7 +2151,7 @@ void QMainWindowLayout::animationFinished(QWidget *widget)
 {
     //this function is called from within the Widget Animator whenever an animation is finished
     //on a certain widget
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (QToolBar *tb = qobject_cast<QToolBar*>(widget)) {
         QToolBarLayout *tbl = qobject_cast<QToolBarLayout*>(tb->layout());
         if (tbl->animating) {
@@ -2219,7 +2222,7 @@ void QMainWindowLayout::animationFinished(QWidget *widget)
             dw->d_func()->plug(currentGapRect);
         }
 #endif
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
         if (QToolBar *tb = qobject_cast<QToolBar*>(widget))
             tb->d_func()->plug(currentGapRect);
 #endif
@@ -2466,7 +2469,7 @@ QLayoutItem *QMainWindowLayout::unplug(QWidget *widget, bool group)
         }
     }
 #endif // QT_CONFIG(dockwidget)
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (QToolBar *tb = qobject_cast<QToolBar*>(widget)) {
         tb->d_func()->unplug(r);
     }
@@ -2614,7 +2617,7 @@ void QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mousePos)
         if (qobject_cast<QDockWidgetGroupWindow *>(widget))
             allowed = true;
 #endif
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
         if (QToolBar *tb = qobject_cast<QToolBar*>(widget))
             allowed = tb->isAreaAllowed(toToolBarArea(path.at(1)));
 #endif
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
index 53e045aaae..aa446cf05b 100644
--- a/src/widgets/widgets/qmainwindowlayout_p.h
+++ b/src/widgets/widgets/qmainwindowlayout_p.h
@@ -69,7 +69,9 @@
 #if QT_CONFIG(dockwidget)
 #include "qdockarealayout_p.h"
 #endif
+#if QT_CONFIG(toolbar)
 #include "qtoolbararealayout_p.h"
+#endif
 
 QT_REQUIRE_CONFIG(mainwindow);
 
@@ -385,7 +387,7 @@ public:
 
     QMainWindowLayoutState(QMainWindow *win);
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     QToolBarAreaLayout toolBarAreaLayout;
 #endif
 
@@ -462,7 +464,7 @@ public:
 
     // toolbars
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     void addToolBarBreak(Qt::ToolBarArea area);
     void insertToolBarBreak(QToolBar *before);
     void removeToolBarBreak(QToolBar *before);
diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h
index b6afb05e3a..721a35bf90 100644
--- a/src/widgets/widgets/qmenu_p.h
+++ b/src/widgets/widgets/qmenu_p.h
@@ -68,6 +68,33 @@ QT_REQUIRE_CONFIG(menu);
 
 QT_BEGIN_NAMESPACE
 
+static inline int pick(Qt::Orientation o, const QPoint &pos)
+{ return o == Qt::Horizontal ? pos.x() : pos.y(); }
+
+static inline int pick(Qt::Orientation o, const QSize &size)
+{ return o == Qt::Horizontal ? size.width() : size.height(); }
+
+static inline int &rpick(Qt::Orientation o, QPoint &pos)
+{ return o == Qt::Horizontal ? pos.rx() : pos.ry(); }
+
+static inline int &rpick(Qt::Orientation o, QSize &size)
+{ return o == Qt::Horizontal ? size.rwidth() : size.rheight(); }
+
+static inline QSizePolicy::Policy pick(Qt::Orientation o, const QSizePolicy &policy)
+{ return o == Qt::Horizontal ? policy.horizontalPolicy() : policy.verticalPolicy(); }
+
+static inline int perp(Qt::Orientation o, const QPoint &pos)
+{ return o == Qt::Vertical ? pos.x() : pos.y(); }
+
+static inline int perp(Qt::Orientation o, const QSize &size)
+{ return o == Qt::Vertical ? size.width() : size.height(); }
+
+static inline int &rperp(Qt::Orientation o, QPoint &pos)
+{ return o == Qt::Vertical ? pos.rx() : pos.ry(); }
+
+static inline int &rperp(Qt::Orientation o, QSize &size)
+{ return o == Qt::Vertical ? size.rwidth() : size.rheight(); }
+
 class QTornOffMenu;
 class QEventLoop;
 
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index b0a75288e8..4758f64c8c 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -52,7 +52,9 @@
 #if QT_CONFIG(mainwindow)
 #include <qmainwindow.h>
 #endif
+#if QT_CONFIG(toolbar)
 #include <qtoolbar.h>
+#endif
 #if QT_CONFIG(toolbutton)
 #include <qtoolbutton.h>
 #endif
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index afb17f533b..8f7271c2dc 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -53,7 +53,9 @@
 #include "qpushbutton.h"
 #include "qstyle.h"
 #include "qstyleoption.h"
+#if QT_CONFIG(toolbar)
 #include "qtoolbar.h"
+#endif
 #include "qdebug.h"
 #include "qlayoutitem.h"
 #if QT_CONFIG(dialogbuttonbox)
@@ -596,7 +598,7 @@ QPoint QPushButtonPrivate::adjustedMenuPosition()
     Q_Q(QPushButton);
 
     bool horizontal = true;
-#if !defined(QT_NO_TOOLBAR)
+#if QT_CONFIG(toolbar)
     QToolBar *tb = qobject_cast<QToolBar*>(parent);
     if (tb && tb->orientation() == Qt::Vertical)
         horizontal = false;
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index 7b6a2a329f..4e90bce69d 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -39,8 +39,6 @@
 
 #include "qtoolbar.h"
 
-#ifndef QT_NO_TOOLBAR
-
 #include <qapplication.h>
 #if QT_CONFIG(combobox)
 #include <qcombobox.h>
@@ -1288,5 +1286,3 @@ void QToolBar::initStyleOption(QStyleOptionToolBar *option) const
 QT_END_NAMESPACE
 
 #include "moc_qtoolbar.cpp"
-
-#endif // QT_NO_TOOLBAR
diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h
index 0253541a2e..4ae83190d1 100644
--- a/src/widgets/widgets/qtoolbar.h
+++ b/src/widgets/widgets/qtoolbar.h
@@ -44,10 +44,9 @@
 #include <QtWidgets/qaction.h>
 #include <QtWidgets/qwidget.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(toolbar);
 
-#ifndef QT_NO_TOOLBAR
+QT_BEGIN_NAMESPACE
 
 class QToolBarPrivate;
 
@@ -211,8 +210,6 @@ private:
 inline QAction *QToolBar::actionAt(int ax, int ay) const
 { return actionAt(QPoint(ax, ay)); }
 
-#endif // QT_NO_TOOLBAR
-
 QT_END_NAMESPACE
 
 #endif // QDYNAMICTOOLBAR_H
diff --git a/src/widgets/widgets/qtoolbar_p.h b/src/widgets/widgets/qtoolbar_p.h
index 616f53f717..4db75762c8 100644
--- a/src/widgets/widgets/qtoolbar_p.h
+++ b/src/widgets/widgets/qtoolbar_p.h
@@ -57,9 +57,9 @@
 #include "private/qwidget_p.h"
 #include <QtCore/qbasictimer.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(toolbar);
 
-#ifndef QT_NO_TOOLBAR
+QT_BEGIN_NAMESPACE
 
 class QToolBarLayout;
 class QTimer;
@@ -127,8 +127,6 @@ public:
     QBasicTimer waitForPopupTimer;
 };
 
-#endif // QT_NO_TOOLBAR
-
 QT_END_NAMESPACE
 
 #endif // QDYNAMICTOOLBAR_P_H
diff --git a/src/widgets/widgets/qtoolbararealayout.cpp b/src/widgets/widgets/qtoolbararealayout.cpp
index 0c57d9251d..edf497111b 100644
--- a/src/widgets/widgets/qtoolbararealayout.cpp
+++ b/src/widgets/widgets/qtoolbararealayout.cpp
@@ -53,8 +53,6 @@
 ** QToolBarAreaLayoutItem
 */
 
-#ifndef QT_NO_TOOLBAR
-
 QT_BEGIN_NAMESPACE
 
 // qmainwindow.cpp
@@ -1391,5 +1389,3 @@ bool QToolBarAreaLayout::isEmpty() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_TOOLBAR
diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h
index 901f04cf14..dffbab1f21 100644
--- a/src/widgets/widgets/qtoolbararealayout_p.h
+++ b/src/widgets/widgets/qtoolbararealayout_p.h
@@ -52,40 +52,14 @@
 //
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
+#include "qmenu_p.h"
 #include <QList>
 #include <QSize>
 #include <QRect>
 
-QT_BEGIN_NAMESPACE
-
-static inline int pick(Qt::Orientation o, const QPoint &pos)
-{ return o == Qt::Horizontal ? pos.x() : pos.y(); }
-
-static inline int pick(Qt::Orientation o, const QSize &size)
-{ return o == Qt::Horizontal ? size.width() : size.height(); }
-
-static inline int &rpick(Qt::Orientation o, QPoint &pos)
-{ return o == Qt::Horizontal ? pos.rx() : pos.ry(); }
-
-static inline int &rpick(Qt::Orientation o, QSize &size)
-{ return o == Qt::Horizontal ? size.rwidth() : size.rheight(); }
-
-static inline QSizePolicy::Policy pick(Qt::Orientation o, const QSizePolicy &policy)
-{ return o == Qt::Horizontal ? policy.horizontalPolicy() : policy.verticalPolicy(); }
-
-static inline int perp(Qt::Orientation o, const QPoint &pos)
-{ return o == Qt::Vertical ? pos.x() : pos.y(); }
+QT_REQUIRE_CONFIG(toolbar);
 
-static inline int perp(Qt::Orientation o, const QSize &size)
-{ return o == Qt::Vertical ? size.width() : size.height(); }
-
-static inline int &rperp(Qt::Orientation o, QPoint &pos)
-{ return o == Qt::Vertical ? pos.rx() : pos.ry(); }
-
-static inline int &rperp(Qt::Orientation o, QSize &size)
-{ return o == Qt::Vertical ? size.rwidth() : size.rheight(); }
-
-#ifndef QT_NO_TOOLBAR
+QT_BEGIN_NAMESPACE
 
 class QToolBar;
 class QLayoutItem;
@@ -244,7 +218,6 @@ public:
     bool isEmpty() const;
 };
 
-
 QT_END_NAMESPACE
-#endif // QT_NO_TOOLBAR
+
 #endif // QTOOLBARAREALAYOUT_P_H
diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp
index 118cb2ae61..f2d329d59d 100644
--- a/src/widgets/widgets/qtoolbarlayout.cpp
+++ b/src/widgets/widgets/qtoolbarlayout.cpp
@@ -59,8 +59,6 @@
 #include "qtoolbarlayout_p.h"
 #include "qtoolbarseparator_p.h"
 
-#ifndef QT_NO_TOOLBAR
-
 QT_BEGIN_NAMESPACE
 
 // qmainwindow.cpp
@@ -753,5 +751,3 @@ QToolBarItem *QToolBarLayout::createItem(QAction *action)
 QT_END_NAMESPACE
 
 #include "moc_qtoolbarlayout_p.cpp"
-
-#endif // QT_NO_TOOLBAR
diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h
index 8c60164439..b813cd5e2c 100644
--- a/src/widgets/widgets/qtoolbarlayout_p.h
+++ b/src/widgets/widgets/qtoolbarlayout_p.h
@@ -56,9 +56,9 @@
 #include <private/qlayoutengine_p.h>
 #include <QVector>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(toolbar);
 
-#ifndef QT_NO_TOOLBAR
+QT_BEGIN_NAMESPACE
 
 class QAction;
 class QToolBarExtension;
@@ -127,8 +127,6 @@ private:
     QMenu *popupMenu;
 };
 
-#endif // QT_NO_TOOLBAR
-
 QT_END_NAMESPACE
 
 #endif // QTOOLBARLAYOUT_P_H
diff --git a/src/widgets/widgets/qtoolbarseparator.cpp b/src/widgets/widgets/qtoolbarseparator.cpp
index c99a8bcc4c..92cd08317a 100644
--- a/src/widgets/widgets/qtoolbarseparator.cpp
+++ b/src/widgets/widgets/qtoolbarseparator.cpp
@@ -39,8 +39,6 @@
 
 #include "qtoolbarseparator_p.h"
 
-#ifndef QT_NO_TOOLBAR
-
 #include <qstyle.h>
 #include <qstyleoption.h>
 #include <qtoolbar.h>
@@ -87,5 +85,3 @@ void QToolBarSeparator::paintEvent(QPaintEvent *)
 QT_END_NAMESPACE
 
 #include "moc_qtoolbarseparator_p.cpp"
-
-#endif // QT_NO_TOOLBAR
diff --git a/src/widgets/widgets/qtoolbarseparator_p.h b/src/widgets/widgets/qtoolbarseparator_p.h
index d52b4fa6ae..60b51a28cb 100644
--- a/src/widgets/widgets/qtoolbarseparator_p.h
+++ b/src/widgets/widgets/qtoolbarseparator_p.h
@@ -54,9 +54,9 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "QtWidgets/qwidget.h"
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(toolbar);
 
-#ifndef QT_NO_TOOLBAR
+QT_BEGIN_NAMESPACE
 
 class QStyleOption;
 class QToolBar;
@@ -80,8 +80,6 @@ public Q_SLOTS:
     void setOrientation(Qt::Orientation orientation);
 };
 
-#endif // QT_NO_TOOLBAR
-
 QT_END_NAMESPACE
 
 #endif // QDYNAMICTOOLBARSEPARATOR_P_H
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index c2bf13a3e9..c94c10574f 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -53,7 +53,9 @@
 #if QT_CONFIG(mainwindow)
 #include <qmainwindow.h>
 #endif
+#if QT_CONFIG(toolbar)
 #include <qtoolbar.h>
+#endif
 #include <qvariant.h>
 #include <qstylepainter.h>
 #include <private/qabstractbutton_p.h>
@@ -201,7 +203,7 @@ void QToolButtonPrivate::init()
 {
     Q_Q(QToolButton);
     defaultAction = 0;
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (qobject_cast<QToolBar*>(parent))
         autoRaise = true;
     else
@@ -245,13 +247,13 @@ void QToolButton::initStyleOption(QStyleOptionToolButton *option) const
     bool forceNoText = false;
     option->iconSize = iconSize(); //default value
 
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     if (parentWidget()) {
         if (QToolBar *toolBar = qobject_cast<QToolBar *>(parentWidget())) {
             option->iconSize = toolBar->iconSize();
         }
     }
-#endif // QT_NO_TOOLBAR
+#endif // QT_CONFIG(toolbar)
 
     if (!forceNoText)
         option->text = d->text;
@@ -571,7 +573,7 @@ void QToolButton::timerEvent(QTimerEvent *e)
 */
 void QToolButton::changeEvent(QEvent *e)
 {
-#ifndef QT_NO_TOOLBAR
+#if QT_CONFIG(toolbar)
     Q_D(QToolButton);
     if (e->type() == QEvent::ParentChange) {
         if (qobject_cast<QToolBar*>(parentWidget()))
@@ -743,7 +745,7 @@ void QToolButtonPrivate::popupTimerDone()
     repeat = q->autoRepeat();
     q->setAutoRepeat(false);
     bool horizontal = true;
-#if !defined(QT_NO_TOOLBAR)
+#if QT_CONFIG(toolbar)
     QToolBar *tb = qobject_cast<QToolBar*>(parent);
     if (tb && tb->orientation() == Qt::Vertical)
         horizontal = false;
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index d3203e180b..43c1c3e365 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -1977,8 +1977,12 @@ void QWidgetTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
         cursor.removeSelectedText();
     }
 
+    QTextBlock block;
+
     // insert commit string
     if (!e->commitString().isEmpty() || e->replacementLength()) {
+        if (e->commitString().endsWith(QChar::LineFeed))
+            block = cursor.block(); // Remember the block where the preedit text is
         QTextCursor c = cursor;
         c.setPosition(c.position() + e->replacementStart());
         c.setPosition(c.position() + e->replacementLength(), QTextCursor::KeepAnchor);
@@ -1997,7 +2001,8 @@ void QWidgetTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
         }
     }
 
-    QTextBlock block = cursor.block();
+    if (!block.isValid())
+        block = cursor.block();
     QTextLayout *layout = block.layout();
     if (isGettingInput)
         layout->setPreeditArea(cursor.position() - block.position(), e->preeditString());
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index a197c41b95..55804c5aaf 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -3,25 +3,16 @@
 HEADERS += \
         widgets/qframe.h \
         widgets/qframe_p.h \
-        widgets/qtoolbar.h \
-        widgets/qtoolbar_p.h \
-        widgets/qtoolbarlayout_p.h \
-        widgets/qtoolbarseparator_p.h \
         widgets/qabstractscrollarea.h \
         widgets/qabstractscrollarea_p.h \
         widgets/qfocusframe.h \
-        widgets/qwidgetanimator_p.h \
-        widgets/qtoolbararealayout_p.h
+        widgets/qwidgetanimator_p.h
 
 SOURCES += \
         widgets/qframe.cpp \
-        widgets/qtoolbar.cpp \
-        widgets/qtoolbarlayout.cpp \
-        widgets/qtoolbarseparator.cpp \
         widgets/qabstractscrollarea.cpp \
         widgets/qfocusframe.cpp \
-        widgets/qwidgetanimator.cpp \
-        widgets/qtoolbararealayout.cpp
+        widgets/qwidgetanimator.cpp
 
 qtConfig(abstractbutton) {
     HEADERS += \
@@ -326,6 +317,21 @@ qtConfig(tabwidget) {
     SOURCES += widgets/qtabwidget.cpp
 }
 
+qtConfig(toolbar) {
+    HEADERS += \
+        widgets/qtoolbar.h \
+        widgets/qtoolbar_p.h \
+        widgets/qtoolbararealayout_p.h \
+        widgets/qtoolbarlayout_p.h \
+        widgets/qtoolbarseparator_p.h
+
+    SOURCES += \
+        widgets/qtoolbar.cpp \
+        widgets/qtoolbarlayout.cpp \
+        widgets/qtoolbararealayout.cpp \
+        widgets/qtoolbarseparator.cpp
+}
+
 qtConfig(toolbox) {
     HEADERS += widgets/qtoolbox.h
     SOURCES += widgets/qtoolbox.cpp