diff options
Diffstat (limited to 'src/widgets')
81 files changed, 32 insertions, 28 deletions
diff --git a/src/widgets/doc/images/fusion-checkbox.png b/src/widgets/doc/images/fusion-checkbox.png Binary files differdeleted file mode 100644 index 669c3f8e23..0000000000 --- a/src/widgets/doc/images/fusion-checkbox.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-dateedit.png b/src/widgets/doc/images/fusion-dateedit.png Binary files differdeleted file mode 100644 index b8ca972eaa..0000000000 --- a/src/widgets/doc/images/fusion-dateedit.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-datetimeedit.png b/src/widgets/doc/images/fusion-datetimeedit.png Binary files differdeleted file mode 100644 index 48b6e320d5..0000000000 --- a/src/widgets/doc/images/fusion-datetimeedit.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-dial.png b/src/widgets/doc/images/fusion-dial.png Binary files differdeleted file mode 100644 index cdda89e02a..0000000000 --- a/src/widgets/doc/images/fusion-dial.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-doublespinbox.png b/src/widgets/doc/images/fusion-doublespinbox.png Binary files differdeleted file mode 100644 index 4c7548c9be..0000000000 --- a/src/widgets/doc/images/fusion-doublespinbox.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-fontcombobox.png b/src/widgets/doc/images/fusion-fontcombobox.png Binary files differdeleted file mode 100644 index 96654b1bfa..0000000000 --- a/src/widgets/doc/images/fusion-fontcombobox.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-frame.png b/src/widgets/doc/images/fusion-frame.png Binary files differdeleted file mode 100644 index 09915bba0c..0000000000 --- a/src/widgets/doc/images/fusion-frame.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-groupbox.png b/src/widgets/doc/images/fusion-groupbox.png Binary files differdeleted file mode 100644 index de2730b2e6..0000000000 --- a/src/widgets/doc/images/fusion-groupbox.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-horizontalscrollbar.png b/src/widgets/doc/images/fusion-horizontalscrollbar.png Binary files differdeleted file mode 100644 index d890b1ce84..0000000000 --- a/src/widgets/doc/images/fusion-horizontalscrollbar.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-lcdnumber.png b/src/widgets/doc/images/fusion-lcdnumber.png Binary files differdeleted file mode 100644 index 55ba6d2926..0000000000 --- a/src/widgets/doc/images/fusion-lcdnumber.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-lineedit.png b/src/widgets/doc/images/fusion-lineedit.png Binary files differdeleted file mode 100644 index 5fd452db55..0000000000 --- a/src/widgets/doc/images/fusion-lineedit.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-listview.png b/src/widgets/doc/images/fusion-listview.png Binary files differdeleted file mode 100644 index 3fcfbce6c4..0000000000 --- a/src/widgets/doc/images/fusion-listview.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-progressbar.png b/src/widgets/doc/images/fusion-progressbar.png Binary files differdeleted file mode 100644 index 4cd61eb3c2..0000000000 --- a/src/widgets/doc/images/fusion-progressbar.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-pushbutton.png b/src/widgets/doc/images/fusion-pushbutton.png Binary files differdeleted file mode 100644 index 0e5aa1aad3..0000000000 --- a/src/widgets/doc/images/fusion-pushbutton.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-radiobutton.png b/src/widgets/doc/images/fusion-radiobutton.png Binary files differdeleted file mode 100644 index 0b7097f2ef..0000000000 --- a/src/widgets/doc/images/fusion-radiobutton.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-slider.png b/src/widgets/doc/images/fusion-slider.png Binary files differdeleted file mode 100644 index e5e3d20cf5..0000000000 --- a/src/widgets/doc/images/fusion-slider.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-spinbox.png b/src/widgets/doc/images/fusion-spinbox.png Binary files differdeleted file mode 100644 index 0f8d75d372..0000000000 --- a/src/widgets/doc/images/fusion-spinbox.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-tableview.png b/src/widgets/doc/images/fusion-tableview.png Binary files differdeleted file mode 100644 index 8aedefccd2..0000000000 --- a/src/widgets/doc/images/fusion-tableview.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-textedit.png b/src/widgets/doc/images/fusion-textedit.png Binary files differdeleted file mode 100644 index 73d92feb15..0000000000 --- a/src/widgets/doc/images/fusion-textedit.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-timeedit.png b/src/widgets/doc/images/fusion-timeedit.png Binary files differdeleted file mode 100644 index d38a139bc2..0000000000 --- a/src/widgets/doc/images/fusion-timeedit.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-toolbox.png b/src/widgets/doc/images/fusion-toolbox.png Binary files differdeleted file mode 100644 index fc4831cf5d..0000000000 --- a/src/widgets/doc/images/fusion-toolbox.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-toolbutton.png b/src/widgets/doc/images/fusion-toolbutton.png Binary files differdeleted file mode 100644 index 32d2ca3677..0000000000 --- a/src/widgets/doc/images/fusion-toolbutton.png +++ /dev/null diff --git a/src/widgets/doc/images/fusion-treeview.png b/src/widgets/doc/images/fusion-treeview.png Binary files differdeleted file mode 100644 index 3aa8bcef54..0000000000 --- a/src/widgets/doc/images/fusion-treeview.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-calendarwidget.png b/src/widgets/doc/images/macintosh-calendarwidget.png Binary files differdeleted file mode 100644 index 2f743501a9..0000000000 --- a/src/widgets/doc/images/macintosh-calendarwidget.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-checkbox.png b/src/widgets/doc/images/macintosh-checkbox.png Binary files differdeleted file mode 100644 index d0130e3f22..0000000000 --- a/src/widgets/doc/images/macintosh-checkbox.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-combobox.png b/src/widgets/doc/images/macintosh-combobox.png Binary files differdeleted file mode 100644 index c1dc3c0c96..0000000000 --- a/src/widgets/doc/images/macintosh-combobox.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-dateedit.png b/src/widgets/doc/images/macintosh-dateedit.png Binary files differdeleted file mode 100644 index 45aee90a9b..0000000000 --- a/src/widgets/doc/images/macintosh-dateedit.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-datetimeedit.png b/src/widgets/doc/images/macintosh-datetimeedit.png Binary files differdeleted file mode 100644 index 62af02d64e..0000000000 --- a/src/widgets/doc/images/macintosh-datetimeedit.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-dial.png b/src/widgets/doc/images/macintosh-dial.png Binary files differdeleted file mode 100644 index df0ffe23a1..0000000000 --- a/src/widgets/doc/images/macintosh-dial.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-doublespinbox.png b/src/widgets/doc/images/macintosh-doublespinbox.png Binary files differdeleted file mode 100644 index a0695ff278..0000000000 --- a/src/widgets/doc/images/macintosh-doublespinbox.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-fontcombobox.png b/src/widgets/doc/images/macintosh-fontcombobox.png Binary files differdeleted file mode 100644 index 8a5a3c78a3..0000000000 --- a/src/widgets/doc/images/macintosh-fontcombobox.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-frame.png b/src/widgets/doc/images/macintosh-frame.png Binary files differdeleted file mode 100644 index fee61a3643..0000000000 --- a/src/widgets/doc/images/macintosh-frame.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-groupbox.png b/src/widgets/doc/images/macintosh-groupbox.png Binary files differdeleted file mode 100644 index f6c7bce580..0000000000 --- a/src/widgets/doc/images/macintosh-groupbox.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-horizontalscrollbar.png b/src/widgets/doc/images/macintosh-horizontalscrollbar.png Binary files differdeleted file mode 100644 index 8b63572a9e..0000000000 --- a/src/widgets/doc/images/macintosh-horizontalscrollbar.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-label.png b/src/widgets/doc/images/macintosh-label.png Binary files differdeleted file mode 100644 index 753aa4d138..0000000000 --- a/src/widgets/doc/images/macintosh-label.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-lcdnumber.png b/src/widgets/doc/images/macintosh-lcdnumber.png Binary files differdeleted file mode 100644 index 2ea9ea0713..0000000000 --- a/src/widgets/doc/images/macintosh-lcdnumber.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-lineedit.png b/src/widgets/doc/images/macintosh-lineedit.png Binary files differdeleted file mode 100644 index 0e992c7ffe..0000000000 --- a/src/widgets/doc/images/macintosh-lineedit.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-listview.png b/src/widgets/doc/images/macintosh-listview.png Binary files differdeleted file mode 100644 index 346e6427ff..0000000000 --- a/src/widgets/doc/images/macintosh-listview.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-menu.png b/src/widgets/doc/images/macintosh-menu.png Binary files differdeleted file mode 100644 index 59bdceaab6..0000000000 --- a/src/widgets/doc/images/macintosh-menu.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-progressbar.png b/src/widgets/doc/images/macintosh-progressbar.png Binary files differdeleted file mode 100644 index 2dfc8aba81..0000000000 --- a/src/widgets/doc/images/macintosh-progressbar.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-pushbutton.png b/src/widgets/doc/images/macintosh-pushbutton.png Binary files differdeleted file mode 100644 index 7ec14910d8..0000000000 --- a/src/widgets/doc/images/macintosh-pushbutton.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-radiobutton.png b/src/widgets/doc/images/macintosh-radiobutton.png Binary files differdeleted file mode 100644 index 8b02f509ff..0000000000 --- a/src/widgets/doc/images/macintosh-radiobutton.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-slider.png b/src/widgets/doc/images/macintosh-slider.png Binary files differdeleted file mode 100644 index bf0c5464e9..0000000000 --- a/src/widgets/doc/images/macintosh-slider.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-spinbox.png b/src/widgets/doc/images/macintosh-spinbox.png Binary files differdeleted file mode 100644 index 4196c37246..0000000000 --- a/src/widgets/doc/images/macintosh-spinbox.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-tableview.png b/src/widgets/doc/images/macintosh-tableview.png Binary files differdeleted file mode 100644 index e6512494de..0000000000 --- a/src/widgets/doc/images/macintosh-tableview.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-tabwidget.png b/src/widgets/doc/images/macintosh-tabwidget.png Binary files differdeleted file mode 100644 index 1d174a47e6..0000000000 --- a/src/widgets/doc/images/macintosh-tabwidget.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-textedit.png b/src/widgets/doc/images/macintosh-textedit.png Binary files differdeleted file mode 100644 index 4f0ce36baf..0000000000 --- a/src/widgets/doc/images/macintosh-textedit.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-timeedit.png b/src/widgets/doc/images/macintosh-timeedit.png Binary files differdeleted file mode 100644 index 4bcfce33f8..0000000000 --- a/src/widgets/doc/images/macintosh-timeedit.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-toolbox.png b/src/widgets/doc/images/macintosh-toolbox.png Binary files differdeleted file mode 100644 index 18d41ea595..0000000000 --- a/src/widgets/doc/images/macintosh-toolbox.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-toolbutton.png b/src/widgets/doc/images/macintosh-toolbutton.png Binary files differdeleted file mode 100644 index f91331cc51..0000000000 --- a/src/widgets/doc/images/macintosh-toolbutton.png +++ /dev/null diff --git a/src/widgets/doc/images/macintosh-treeview.png b/src/widgets/doc/images/macintosh-treeview.png Binary files differdeleted file mode 100644 index afda6d8372..0000000000 --- a/src/widgets/doc/images/macintosh-treeview.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-calendarwidget.png b/src/widgets/doc/images/windowsvista-calendarwidget.png Binary files differdeleted file mode 100644 index 3cb1ab78dc..0000000000 --- a/src/widgets/doc/images/windowsvista-calendarwidget.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-checkbox.png b/src/widgets/doc/images/windowsvista-checkbox.png Binary files differdeleted file mode 100644 index b9bc909988..0000000000 --- a/src/widgets/doc/images/windowsvista-checkbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-combobox.png b/src/widgets/doc/images/windowsvista-combobox.png Binary files differdeleted file mode 100644 index f53192f45a..0000000000 --- a/src/widgets/doc/images/windowsvista-combobox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-dateedit.png b/src/widgets/doc/images/windowsvista-dateedit.png Binary files differdeleted file mode 100644 index bb79482849..0000000000 --- a/src/widgets/doc/images/windowsvista-dateedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-datetimeedit.png b/src/widgets/doc/images/windowsvista-datetimeedit.png Binary files differdeleted file mode 100644 index 0a104de084..0000000000 --- a/src/widgets/doc/images/windowsvista-datetimeedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-dial.png b/src/widgets/doc/images/windowsvista-dial.png Binary files differdeleted file mode 100644 index 7081269c31..0000000000 --- a/src/widgets/doc/images/windowsvista-dial.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-doublespinbox.png b/src/widgets/doc/images/windowsvista-doublespinbox.png Binary files differdeleted file mode 100644 index 6efa9379fd..0000000000 --- a/src/widgets/doc/images/windowsvista-doublespinbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-frame.png b/src/widgets/doc/images/windowsvista-frame.png Binary files differdeleted file mode 100644 index 63b8422d2b..0000000000 --- a/src/widgets/doc/images/windowsvista-frame.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-groupbox.png b/src/widgets/doc/images/windowsvista-groupbox.png Binary files differdeleted file mode 100644 index 967d8878a7..0000000000 --- a/src/widgets/doc/images/windowsvista-groupbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-horizontalscrollbar.png b/src/widgets/doc/images/windowsvista-horizontalscrollbar.png Binary files differdeleted file mode 100644 index 996865d66c..0000000000 --- a/src/widgets/doc/images/windowsvista-horizontalscrollbar.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-label.png b/src/widgets/doc/images/windowsvista-label.png Binary files differdeleted file mode 100644 index caef8d8361..0000000000 --- a/src/widgets/doc/images/windowsvista-label.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-lcdnumber.png b/src/widgets/doc/images/windowsvista-lcdnumber.png Binary files differdeleted file mode 100644 index 911438e2b1..0000000000 --- a/src/widgets/doc/images/windowsvista-lcdnumber.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-lineedit.png b/src/widgets/doc/images/windowsvista-lineedit.png Binary files differdeleted file mode 100644 index 9fcde3a851..0000000000 --- a/src/widgets/doc/images/windowsvista-lineedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-listview.png b/src/widgets/doc/images/windowsvista-listview.png Binary files differdeleted file mode 100644 index 36a03438ab..0000000000 --- a/src/widgets/doc/images/windowsvista-listview.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-progressbar.png b/src/widgets/doc/images/windowsvista-progressbar.png Binary files differdeleted file mode 100644 index 0bda010811..0000000000 --- a/src/widgets/doc/images/windowsvista-progressbar.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-slider.png b/src/widgets/doc/images/windowsvista-slider.png Binary files differdeleted file mode 100644 index be2fffb7b5..0000000000 --- a/src/widgets/doc/images/windowsvista-slider.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-spinbox.png b/src/widgets/doc/images/windowsvista-spinbox.png Binary files differdeleted file mode 100644 index 4a2293e724..0000000000 --- a/src/widgets/doc/images/windowsvista-spinbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-tableview.png b/src/widgets/doc/images/windowsvista-tableview.png Binary files differdeleted file mode 100644 index 96f4937bc1..0000000000 --- a/src/widgets/doc/images/windowsvista-tableview.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-textedit.png b/src/widgets/doc/images/windowsvista-textedit.png Binary files differdeleted file mode 100644 index 5e5696623e..0000000000 --- a/src/widgets/doc/images/windowsvista-textedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-timeedit.png b/src/widgets/doc/images/windowsvista-timeedit.png Binary files differdeleted file mode 100644 index e24fdd268a..0000000000 --- a/src/widgets/doc/images/windowsvista-timeedit.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-toolbox.png b/src/widgets/doc/images/windowsvista-toolbox.png Binary files differdeleted file mode 100644 index 8cfe5f9cab..0000000000 --- a/src/widgets/doc/images/windowsvista-toolbox.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-toolbutton.png b/src/widgets/doc/images/windowsvista-toolbutton.png Binary files differdeleted file mode 100644 index 0baa9809c1..0000000000 --- a/src/widgets/doc/images/windowsvista-toolbutton.png +++ /dev/null diff --git a/src/widgets/doc/images/windowsvista-treeview.png b/src/widgets/doc/images/windowsvista-treeview.png Binary files differdeleted file mode 100644 index db211e4b5f..0000000000 --- a/src/widgets/doc/images/windowsvista-treeview.png +++ /dev/null diff --git a/src/widgets/doc/src/qtwidgets-index.qdoc b/src/widgets/doc/src/qtwidgets-index.qdoc index 6253ae8d7d..c05b16a0a0 100644 --- a/src/widgets/doc/src/qtwidgets-index.qdoc +++ b/src/widgets/doc/src/qtwidgets-index.qdoc @@ -133,6 +133,10 @@ interfaces \section2 Tutorials \list \li \l{Widgets Tutorial} + \li \l{Getting Started Programming with Qt Widgets} + \li \l{Creating a Qt Widget Based Application} + + \li \l{Model/View Tutorial} \endlist diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc index 0d21d3242d..e507d66451 100644 --- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc @@ -57,15 +57,15 @@ is set on a widget in this way, it takes charge of the following tasks: \list - \li Positioning of child widgets. - \li Sensible default sizes for windows. - \li Sensible minimum sizes for windows. - \li Resize handling. + \li Positioning of child widgets + \li Sensible default sizes for windows + \li Sensible minimum sizes for windows + \li Resize handling \li Automatic updates when contents change: \list - \li Font size, text or other contents of child widgets. - \li Hiding or showing a child widget. - \li Removal of child widgets. + \li Font size, text or other contents of child widgets + \li Hiding or showing a child widget + \li Removal of child widgets \endlist \endlist @@ -392,7 +392,6 @@ Many Qt Widgets \l{Qt Widgets Examples}{examples} already use layouts, however, several examples exist to showcase various layouts. - \list - \li \l{Layout Examples} - \endlist + \annotatedlist examples-layout + */ diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp index 9d2e69dec9..9b54c5c2fe 100644 --- a/src/widgets/itemviews/qdirmodel.cpp +++ b/src/widgets/itemviews/qdirmodel.cpp @@ -52,6 +52,7 @@ #include <qstyle.h> #include <qapplication.h> #include <private/qabstractitemmodel_p.h> +#include <private/qfilesystementry_p.h> #include <qdebug.h> #include <stack> @@ -1104,8 +1105,9 @@ QString QDirModel::fileName(const QModelIndex &index) const if (!d->indexValid(index)) return QString(); QFileInfo info = fileInfo(index); - if (info.isRoot()) - return info.absoluteFilePath(); + const QString &path = info.absoluteFilePath(); + if (QFileSystemEntry::isRootPath(path)) + return path; if (d->resolveSymlinks && info.isSymLink()) info = d->resolvedInfo(info); return info.fileName(); @@ -1280,8 +1282,8 @@ QString QDirModelPrivate::name(const QModelIndex &index) const { const QDirNode *n = node(index); const QFileInfo info = n->info; - if (info.isRoot()) { - QString name = info.absoluteFilePath(); + QString name = info.absoluteFilePath(); + if (QFileSystemEntry::isRootPath(name)) { #if defined(Q_OS_WIN) if (name.startsWith(QLatin1Char('/'))) // UNC host return info.fileName(); diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp index 8c3cf3859e..65ae6b9505 100644 --- a/src/widgets/itemviews/qfileiconprovider.cpp +++ b/src/widgets/itemviews/qfileiconprovider.cpp @@ -46,6 +46,7 @@ #include <private/qfunctions_p.h> #include <private/qguiapplication_p.h> #include <private/qicon_p.h> +#include <private/qfilesystementry_p.h> #include <qpa/qplatformintegration.h> #include <qpa/qplatformservices.h> #include <qpa/qplatformtheme.h> @@ -247,10 +248,11 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const if (!retIcon.isNull()) return retIcon; - if (info.isRoot()) + const QString &path = info.absoluteFilePath(); + if (path.isEmpty() || QFileSystemEntry::isRootPath(path)) #if defined (Q_OS_WIN) && !defined(Q_OS_WINRT) { - UINT type = GetDriveType((wchar_t *)info.absoluteFilePath().utf16()); + UINT type = GetDriveType(reinterpret_cast<const wchar_t *>(path.utf16())); switch (type) { case DRIVE_REMOVABLE: @@ -298,7 +300,7 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const QString QFileIconProvider::type(const QFileInfo &info) const { - if (info.isRoot()) + if (QFileSystemEntry::isRootPath(info.absoluteFilePath())) return QApplication::translate("QFileDialog", "Drive"); if (info.isFile()) { if (!info.suffix().isEmpty()) { diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index 3e3c795839..1bdcecbc81 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -67,15 +67,6 @@ macx: { SOURCES += kernel/qmacgesturerecognizer.cpp } -wince { - HEADERS += \ - ../corelib/kernel/qfunctions_wince.h \ - kernel/qwidgetsfunctions_wince.h - - SOURCES += \ - kernel/qwidgetsfunctions_wince.cpp -} - qtConfig(opengl) { HEADERS += kernel/qopenglwidget.h SOURCES += kernel/qopenglwidget.cpp diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index c5db3a7c9a..b96492d623 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -832,7 +832,12 @@ class StaticDayOfWeekAssociativeArray { static Q_DECL_CONSTEXPR int day2idx(Qt::DayOfWeek day) Q_DECL_NOTHROW { return int(day) - 1; } // alt: day % 7 public: Q_DECL_CONSTEXPR StaticDayOfWeekAssociativeArray() Q_DECL_NOEXCEPT_EXPR(noexcept(T())) - : contained(), data() {} +#ifdef Q_COMPILER_CONSTEXPR + : contained{}, data{} // arrays require uniform initialization +#else + : contained(), data() +#endif + {} Q_DECL_CONSTEXPR bool contains(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return contained[day2idx(day)]; } Q_DECL_CONSTEXPR const T &value(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return data[day2idx(day)]; } diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 1a4e9ae87b..4ac8118c87 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -950,7 +950,7 @@ QString QLineEdit::selectedText() const } /*! - selectionStart() returns the index of the first selected character in the + Returns the index of the first selected character in the line edit or -1 if no text is selected. \sa selectedText() @@ -1181,6 +1181,7 @@ QMargins QLineEdit::textMargins() const \row \li \c > \li All following alphabetic characters are uppercased. \row \li \c < \li All following alphabetic characters are lowercased. \row \li \c ! \li Switch off case conversion. + \row \li \c {[ ] { }} \li Reserved. \row \li \tt{\\} \li Use \tt{\\} to escape the special characters listed above to use them as separators. |
