Merge "Merge remote-tracking branch 'origin/5.15' into dev"

5 files changed, 3 insertions, 12 deletions

diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 882ad8a5a6..e3d4680d6d 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -2445,14 +2445,15 @@ void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::funct
     (*openFileImpl)();
 #else
     QFileDialog *dialog = new QFileDialog();
+    dialog->setFileMode(QFileDialog::ExistingFile);
     dialog->selectNameFilter(nameFilter);
 
     auto fileSelected = [=](const QString &fileName) {
         QByteArray fileContent;
         if (!fileName.isNull()) {
             QFile selectedFile(fileName);
-            selectedFile.open(QIODevice::ReadOnly);
-            fileContent = selectedFile.readAll();
+            if (selectedFile.open(QIODevice::ReadOnly))
+                fileContent = selectedFile.readAll();
         }
         fileOpenCompleted(fileName, fileContent);
     };
diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
index e42e6d42ec..24f8cd836f 100644
--- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
@@ -33,7 +33,6 @@
     layouts.
 
     \previouspage Qt Widgets
-    \contentspage Qt Widgets
     \nextpage {Styles and Style Aware Widgets}{Styles}
 
     \ingroup frameworks-technologies
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index 50f626e7a6..be0a23f79c 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -35,7 +35,6 @@
     \ingroup qt-gui-concepts
 
     \previouspage {Styles and Style Aware Widgets}{Styles}
-    \contentspage Widgets and Layouts
     \nextpage The Style Sheet Syntax
 
     \keyword style sheet
@@ -139,7 +138,6 @@
 
 /*!
     \page stylesheet-syntax.html
-    \contentspage {Qt Style Sheets}{Contents}
     \previouspage Qt Style Sheets
     \nextpage Qt Designer Integration
     \title The Style Sheet Syntax
@@ -562,7 +560,6 @@
 
 /*!
     \page stylesheet-designer.html
-    \contentspage {Qt Style Sheets}{Contents}
     \previouspage The Style Sheet Syntax
     \nextpage Customizing Qt Widgets Using Style Sheets
     \title Qt Designer Integration
@@ -588,7 +585,6 @@
 
 /*!
     \page stylesheet-customizing.html
-    \contentspage {Qt Style Sheets}{Contents}
     \previouspage Qt Designer Integration
     \nextpage Qt Style Sheets Reference
     \title Customizing Qt Widgets Using Style Sheets
@@ -692,7 +688,6 @@
 
 /*!
     \page stylesheet-reference.html
-    \contentspage {Qt Style Sheets}{Contents}
     \previouspage Customizing Qt Widgets Using Style Sheets
     \nextpage Qt Style Sheets Examples
     \title Qt Style Sheets Reference
@@ -3506,7 +3501,6 @@
 
 /*!
     \page stylesheet-examples.html
-    \contentspage {Qt Style Sheets}{Contents}
     \previouspage Qt Style Sheets Reference
     \title Qt Style Sheets Examples
 
diff --git a/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc b/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc
index 81bc6dd279..5b1ce435d8 100644
--- a/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc
+++ b/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc
@@ -39,7 +39,6 @@
     \brief An overview over dialog windows.
 
     \previouspage Application Main Window
-    \contentspage Application Windows and Dialogs
     \nextpage Desktop Integration
 
     Dialogs can be \e{modal}, in which case the user is required to provide
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index 105318ba20..16705be1ff 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -697,8 +697,6 @@ QDateTimeEdit::Sections QDateTimeEdit::displayedSections() const
   \property QDateTimeEdit::currentSection
 
   \brief The current section of the spinbox.
-
-  \sa setCurrentSection()
 */
 
 QDateTimeEdit::Section QDateTimeEdit::currentSection() const