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

Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/windows/qwindowscontext.cpp
	src/plugins/platforms/windows/windows.pri
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f

1 files changed, 0 insertions, 142 deletions

diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc
deleted file mode 100644
index 4d4e2b9a8d..0000000000
--- a/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-  \page gallery-macintosh.html
-
-  \title Macintosh Style Widget Gallery
-  \ingroup gallery
-
-  This page shows some of the widgets available in Qt
-  when configured to use the "macintosh" style. This
-  style is only available on Mac OSX, and provides
-  native look'n'feel by integrating to the Mac OSX
-  platform theme. Thus, the final appearance varies
-  depending on the active Mac OSX theme.
-
-\section2 Buttons
-
-\table 100%
-\row
-\li \image macintosh-pushbutton.png
-   \caption The QPushButton widget provides a command button.
-\li \image macintosh-toolbutton.png
-   \caption The QToolButton class provides a quick-access button to commands
-    or options, usually used inside a QToolBar.
-\endtable
-
-\table 100%
-\row
-\li \image macintosh-checkbox.png
-   \caption The QCheckBox widget provides a checkbox with a text label.
-\li \image macintosh-radiobutton.png
-   \caption The QRadioButton widget provides a radio button with a text or pixmap label.
-\endtable
-
-\section2 Containers
-
-\table 100%
-\row
-\li \image macintosh-groupbox.png
-   The QGroupBox widget provides a group box frame with a title.
-\li \image macintosh-tabwidget.png
-   The QTabWidget class provides a stack of tabbed widgets.
-\li \image macintosh-frame.png
-   The QFrame widget provides a simple decorated container for other widgets.
-\li \image macintosh-toolbox.png
-   The QToolBox class provides a column of tabbed widget items.
-\endtable
-
-\section2 Item Views
-
-\table 100%
-\row
-\li \image macintosh-listview.png
-   The QListView class provides a default model/view implementation of a list/icon view. The QListWidget class provides a classic item-based list/icon view.
-\li \image macintosh-treeview.png
-   The QTreeView class provides a default model/view implementation of a tree view. The QTreeWidget class provides a classic item-based tree view.
-\li \image macintosh-tableview.png
-   The QTableView class provides a default model/view implementation of a table view. The QTableWidget class provides a classic item-based table view.\li
-\li
-\endtable
-
-\section2 Display Widgets
-
-\table 100%
-\row
-\li \image macintosh-progressbar.png
-   The QProgressBar widget provides a horizontal progress bar.
-\li \image macintosh-label.png
-   The QLabel widget provides a text or image display.
-\li \image macintosh-lcdnumber.png
-   The QLCDNumber widget displays a number with LCD-like digits.
-\endtable
-
-\section2 Input Widgets
-
-\table 100%
-\row
-\li \image macintosh-lineedit.png
-   The QLineEdit widget is a one-line text editor.
-\li \image macintosh-dateedit.png
-   The QDateEdit class provides a widget for editing dates.
-\li \image macintosh-timeedit.png
-   The QTimeEdit class provides a widget for editing times.
-\li \image macintosh-datetimeedit.png
-   The QDateTimeEdit class provides a widget for editing dates and times.
-\endtable
-
-\table 100%
-\row
-\li \image macintosh-slider.png
-   The QSlider widget provides a vertical or horizontal slider.
-\li \image macintosh-combobox.png
-   The QComboBox widget is a combined button and pop-up list.
-\li \image macintosh-spinbox.png
-   The QSpinBox class provides a spin box widget.
-\endtable
-
-\table 100%
-\row
-\li \image macintosh-fontcombobox.png
-   The QFontComboBox widget is a specialized combobox that enables fonts to be selected from a pop-up list containing previews of available fonts.
-\li \image macintosh-doublespinbox.png
-   The QDoubleSpinBox class provides a spin box widget that allows double precision floating point numbers to be entered.
-\li \image macintosh-horizontalscrollbar.png
-   The QScrollBar widget provides a vertical or horizontal scroll bar. Here, we show a scroll bar with horizontal orientation.
-\endtable
-
-\table 100%
-\row
-\li \image macintosh-dial.png
-   The QDial class provides a rounded range control (like a speedometer or potentiometer).
-\li \image macintosh-textedit.png
-   The QTextEdit class provides a widget that is used to edit and display both plain and rich text.
-\li \image macintosh-calendarwidget.png
-   The QCalendarWidget class provides a monthly calendar widget that can be used to select dates.
-\endtable
-*/