Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

1 files changed, 0 insertions, 40 deletions

diff --git a/examples/widgets/widgets/icons/iconpreviewarea.cpp b/examples/widgets/widgets/icons/iconpreviewarea.cpp
index 1a2f514ba8..7a73a137cd 100644
--- a/examples/widgets/widgets/icons/iconpreviewarea.cpp
+++ b/examples/widgets/widgets/icons/iconpreviewarea.cpp
@@ -79,8 +79,6 @@ IconPreviewArea::IconPreviewArea(QWidget *parent)
 }
 //! [0]
 
-#ifdef Q_COMPILER_INITIALIZER_LISTS
-
 //! [42]
 QVector<QIcon::Mode> IconPreviewArea::iconModes()
 {
@@ -107,44 +105,6 @@ QStringList IconPreviewArea::iconStateNames()
 }
 //! [42]
 
-#else // Q_COMPILER_INITIALIZER_LISTS
-
-//! [43]
-QVector<QIcon::Mode> IconPreviewArea::iconModes()
-{
-    static QVector<QIcon::Mode> result;
-    if (result.isEmpty())
-        result << QIcon::Normal << QIcon::Active << QIcon::Disabled << QIcon::Selected;
-    return result;
-}
-//! [43]
-
-QVector<QIcon::State> IconPreviewArea::iconStates()
-{
-    static QVector<QIcon::State> result;
-    if (result.isEmpty())
-        result << QIcon::Off << QIcon::On;
-    return result;
-}
-
-QStringList IconPreviewArea::iconModeNames()
-{
-    static QStringList result;
-    if (result.isEmpty())
-        result << tr("Normal") << tr("Active") << tr("Disabled") << tr("Selected");
-    return result;
-}
-
-QStringList IconPreviewArea::iconStateNames()
-{
-    static QStringList result;
-    if (result.isEmpty())
-        result << tr("Off") << tr("On");
-    return result;
-}
-
-#endif // !Q_COMPILER_INITIALIZER_LISTS
-
 //! [1]
 void IconPreviewArea::setIcon(const QIcon &icon)
 {