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

Change-Id: I1b6fdc6b0ac59dd726a9977620f1070bebf237a6

8 files changed, 570 insertions, 9 deletions

diff --git a/examples/charts/chartthemes/README.md b/examples/charts/chartthemes/README.md
new file mode 100644
index 000000000..e11fa93c5
--- /dev/null
+++ b/examples/charts/chartthemes/README.md
@@ -0,0 +1,9 @@
+# Chart themes
+
+To generated the file `ui_themewidget.py`, the following
+command need to be executed:
+
+`pyside2-uic themewidget.ui > ui_themewidget.py`
+
+Also, if you modify the UI file, then you would need
+to run the previous command again.
diff --git a/examples/charts/chartthemes/main.py b/examples/charts/chartthemes/main.py
new file mode 100644
index 000000000..263259716
--- /dev/null
+++ b/examples/charts/chartthemes/main.py
@@ -0,0 +1,381 @@
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Qt for Python examples of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:BSD$
+## You may use this file under the terms of the BSD license as follows:
+##
+## "Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are
+## met:
+##   * Redistributions of source code must retain the above copyright
+##     notice, this list of conditions and the following disclaimer.
+##   * Redistributions in binary form must reproduce the above copyright
+##     notice, this list of conditions and the following disclaimer in
+##     the documentation and/or other materials provided with the
+##     distribution.
+##   * Neither the name of The Qt Company Ltd nor the names of its
+##     contributors may be used to endorse or promote products derived
+##     from this software without specific prior written permission.
+##
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+"""PySide2 port of the Chart Themes example from Qt v5.x"""
+
+import sys
+from PySide2.QtCore import qApp, QPointF, Qt
+from PySide2.QtGui import QColor, QPainter, QPalette
+from PySide2.QtWidgets import (QApplication, QMainWindow, QSizePolicy,
+    QWidget)
+from PySide2.QtCharts import QtCharts
+
+from ui_themewidget import Ui_ThemeWidgetForm as ui
+
+from random import random, uniform
+
+class ThemeWidget(QWidget):
+    def __init__(self, parent):
+        QWidget.__init__(self, parent)
+        self.charts = []
+
+        self.ui = ui()
+        self.list_count = 3
+        self.value_max = 10
+        self.value_count = 7
+        self.data_table = self.generate_random_data(self.list_count,
+            self.value_max, self.value_count)
+
+        self.ui.setupUi(self)
+        self.populate_themebox()
+        self.populate_animationbox()
+        self.populate_legendbox()
+
+        # Area Chart
+        chart_view =  QtCharts.QChartView(self.create_areachart())
+        self.ui.gridLayout.addWidget(chart_view, 1, 0)
+        self.charts.append(chart_view)
+
+        # Pie Chart
+        chart_view =  QtCharts.QChartView(self.createPieChart())
+        chart_view.setSizePolicy(QSizePolicy.Ignored,
+            QSizePolicy.Ignored)
+        self.ui.gridLayout.addWidget(chart_view, 1, 1)
+        self.charts.append(chart_view)
+
+        # Line Chart
+        chart_view =  QtCharts.QChartView(self.createLineChart())
+        self.ui.gridLayout.addWidget(chart_view, 1, 2)
+        self.charts.append(chart_view)
+
+        # Bar Chart
+        chart_view =  QtCharts.QChartView(self.createBarChart())
+        self.ui.gridLayout.addWidget(chart_view, 2, 0)
+        self.charts.append(chart_view)
+
+        # Spline Chart
+        chart_view =  QtCharts.QChartView(self.createSplineChart())
+        self.ui.gridLayout.addWidget(chart_view, 2, 1)
+        self.charts.append(chart_view)
+
+        # Scatter Chart
+        chart_view =  QtCharts.QChartView(self.create_scatterchart())
+        self.ui.gridLayout.addWidget(chart_view, 2, 2)
+        self.charts.append(chart_view)
+
+        # Set defaults
+        self.ui.antialiasCheckBox.setChecked(True)
+
+        # Set the colors from the light theme as default ones
+        pal = qApp.palette()
+        pal.setColor(QPalette.Window, QColor(0xf0f0f0))
+        pal.setColor(QPalette.WindowText, QColor(0x404044))
+        qApp.setPalette(pal)
+
+        self.updateUI()
+
+
+    def generate_random_data(self, list_count, value_max, value_count):
+        data_table = []
+        for i in range(list_count):
+            data_list = []
+            y_value = 0
+            for j in range(value_count):
+                constant = value_max / float(value_count)
+                y_value += uniform(0, constant)
+                x_value = (j + random()) * constant
+                value = QPointF(x_value, y_value)
+                label = "Slice {}: {}".format(i, j)
+                data_list.append((value, label))
+            data_table.append(data_list)
+
+        return data_table
+
+    def populate_themebox(self):
+        theme = self.ui.themeComboBox
+        qchart = QtCharts.QChart
+
+        theme.addItem("Light", qchart.ChartThemeLight)
+        theme.addItem("Blue Cerulean", qchart.ChartThemeBlueCerulean)
+        theme.addItem("Dark", qchart.ChartThemeDark)
+        theme.addItem("Brown Sand", qchart.ChartThemeBrownSand)
+        theme.addItem("Blue NCS", qchart.ChartThemeBlueNcs)
+        theme.addItem("High Contrast", qchart.ChartThemeHighContrast)
+        theme.addItem("Blue Icy", qchart.ChartThemeBlueIcy)
+        theme.addItem("Qt", qchart.ChartThemeQt)
+
+    def populate_animationbox(self):
+        animated = self.ui.animatedComboBox
+        qchart = QtCharts.QChart
+
+        animated.addItem("No Animations", qchart.NoAnimation)
+        animated.addItem("GridAxis Animations", qchart.GridAxisAnimations)
+        animated.addItem("Series Animations", qchart.SeriesAnimations)
+        animated.addItem("All Animations", qchart.AllAnimations)
+
+    def populate_legendbox(self):
+        legend = self.ui.legendComboBox
+
+        legend.addItem("No Legend ", 0)
+        legend.addItem("Legend Top", Qt.AlignTop)
+        legend.addItem("Legend Bottom", Qt.AlignBottom)
+        legend.addItem("Legend Left", Qt.AlignLeft)
+        legend.addItem("Legend Right", Qt.AlignRight)
+
+    def create_areachart(self):
+        chart = QtCharts.QChart()
+        chart.setTitle("Area Chart")
+
+        # The lower series initialized to zero values
+        lower_series = None
+        name = "Series "
+        for i in range(len(self.data_table)):
+            upper_series = QtCharts.QLineSeries(chart)
+            for j in range(len(self.data_table[i])):
+                data = self.data_table[i][j]
+                if lower_series:
+                    points = lower_series.pointsVector()
+                    y_value = points[i].y() + data[0].y()
+                    upper_series.append(QPointF(j, y_value))
+                else:
+                    upper_series.append(QPointF(j, data[0].y()))
+            area = QtCharts.QAreaSeries(upper_series, lower_series)
+            area.setName("{}{}".format(name, i))
+            chart.addSeries(area)
+            lower_series = upper_series
+
+        chart.createDefaultAxes()
+        chart.axisX().setRange(0, self.value_count - 1)
+        chart.axisY().setRange(0, self.value_max)
+        # Add space to label to add space between labels and axis
+        chart.axisY().setLabelFormat("%.1f  ")
+
+        return chart
+
+    def createBarChart(self):
+        chart = QtCharts.QChart()
+        chart.setTitle("Bar chart")
+
+        series = QtCharts.QStackedBarSeries(chart)
+        for i in range(len(self.data_table)):
+            barset = QtCharts.QBarSet("Bar set {}".format(i))
+            for data in self.data_table[i]:
+                barset.append(data[0].y())
+            series.append(barset)
+
+        chart.addSeries(series)
+
+        chart.createDefaultAxes()
+        chart.axisY().setRange(0, self.value_max * 2)
+        # Add space to label to add space between labels and axis
+        chart.axisY().setLabelFormat("%.1f  ")
+
+        return chart
+
+    def createLineChart(self):
+        chart = QtCharts.QChart()
+        chart.setTitle("Line chart")
+
+        name = "Series "
+        for i, lst in enumerate(self.data_table):
+            series = QtCharts.QLineSeries(chart)
+            for data in lst:
+                series.append(data[0])
+            series.setName("{}{}".format(name, i))
+            chart.addSeries(series)
+
+        chart.createDefaultAxes()
+        chart.axisX().setRange(0, self.value_max)
+        chart.axisY().setRange(0, self.value_count)
+        # Add space to label to add space between labels and axis
+        chart.axisY().setLabelFormat("%.1f  ")
+
+        return chart
+
+    def createPieChart(self):
+        chart = QtCharts.QChart()
+        chart.setTitle("Pie chart")
+
+        series = QtCharts.QPieSeries(chart)
+        for data in self.data_table[0]:
+            slc = series.append(data[1], data[0].y())
+            if data == self.data_table[0][0]:
+                # Show the first slice exploded with label
+                slc.setLabelVisible()
+                slc.setExploded()
+                slc.setExplodeDistanceFactor(0.5)
+
+        series.setPieSize(0.4)
+        chart.addSeries(series)
+
+        return chart
+
+    def createSplineChart(self):
+        chart = QtCharts.QChart()
+        chart.setTitle("Spline chart")
+        name = "Series "
+        for i, lst in enumerate(self.data_table):
+            series = QtCharts.QSplineSeries(chart)
+            for data in lst:
+                series.append(data[0])
+            series.setName("{}{}".format(name, i))
+            chart.addSeries(series)
+
+        chart.createDefaultAxes()
+        chart.axisX().setRange(0, self.value_max)
+        chart.axisY().setRange(0, self.value_count)
+        # Add space to label to add space between labels and axis
+        chart.axisY().setLabelFormat("%.1f  ")
+
+        return chart
+
+    def create_scatterchart(self):
+        chart = QtCharts.QChart()
+        chart.setTitle("Scatter chart")
+        name = "Series "
+        for i, lst in enumerate(self.data_table):
+            series = QtCharts.QScatterSeries(chart)
+            for data in lst:
+                series.append(data[0])
+            series.setName("{}{}".format(name, i))
+            chart.addSeries(series)
+
+        chart.createDefaultAxes()
+        chart.axisX().setRange(0, self.value_max)
+        chart.axisY().setRange(0, self.value_count)
+        # Add space to label to add space between labels and axis
+        chart.axisY().setLabelFormat("%.1f  ")
+
+        return chart
+
+    def updateUI(self):
+        def set_colors(window_color, text_color):
+            pal = self.window().palette()
+            pal.setColor(QPalette.Window, window_color)
+            pal.setColor(QPalette.WindowText, text_color)
+            self.window().setPalette(pal)
+
+        idx = self.ui.themeComboBox.currentIndex()
+        theme = self.ui.themeComboBox.itemData(idx)
+        qchart = QtCharts.QChart
+
+        if len(self.charts):
+            chart_theme = self.charts[0].chart().theme()
+            if chart_theme != theme:
+                for chart_view in self.charts:
+                    if theme == 0:
+                        theme_name = qchart.ChartThemeLight
+                    elif theme == 1:
+                        theme_name = qchart.ChartThemeBlueCerulean
+                    elif theme == 2:
+                        theme_name = qchart.ChartThemeDark
+                    elif theme == 3:
+                        theme_name = qchart.ChartThemeBrownSand
+                    elif theme == 4:
+                        theme_name = qchart.ChartThemeBlueNcs
+                    elif theme == 5:
+                        theme_name = qchart.ChartThemeHighContrast
+                    elif theme == 6:
+                        theme_name = qchart.ChartThemeBlueIcy
+                    elif theme == 7:
+                        theme_name = qchart.ChartThemeQt
+                    else:
+                        theme_name = qchart.ChartThemeLight
+
+                    chart_view.chart().setTheme(theme_name)
+
+                # Set palette colors based on selected theme
+                if theme == qchart.ChartThemeLight:
+                    set_colors(QColor(0xf0f0f0), QColor(0x404044))
+                elif theme == qchart.ChartThemeDark:
+                    set_colors(QColor(0x121218), QColor(0xd6d6d6))
+                elif theme == qchart.ChartThemeBlueCerulean:
+                    set_colors(QColor(0x40434a), QColor(0xd6d6d6))
+                elif theme == qchart.ChartThemeBrownSand:
+                    set_colors(QColor(0x9e8965), QColor(0x404044))
+                elif theme == qchart.ChartThemeBlueNcs:
+                    set_colors(QColor(0x018bba), QColor(0x404044))
+                elif theme == qchart.ChartThemeHighContrast:
+                    set_colors(QColor(0xffab03), QColor(0x181818))
+                elif theme == qchart.ChartThemeBlueIcy:
+                    set_colors(QColor(0xcee7f0), QColor(0x404044))
+                else:
+                    set_colors(QColor(0xf0f0f0), QColor(0x404044))
+
+
+        # Update antialiasing
+        checked = self.ui.antialiasCheckBox.isChecked()
+        for chart in self.charts:
+            chart.setRenderHint(QPainter.Antialiasing, checked)
+
+        # Update animation options
+        idx = self.ui.animatedComboBox.currentIndex()
+        options = self.ui.animatedComboBox.itemData(idx)
+
+        if len(self.charts):
+            chart = self.charts[0].chart()
+            animation_options = chart.animationOptions()
+            if animation_options != options:
+                for chart_view in self.charts:
+                    chart_view.chart().setAnimationOptions(options)
+
+        # Update legend alignment
+        idx = self.ui.legendComboBox.currentIndex()
+        alignment = self.ui.legendComboBox.itemData(idx)
+
+        if not alignment:
+            for chart_view in self.charts:
+                chart_view.chart().legend().hide()
+        else:
+            for chart_view in self.charts:
+                chart_view.chart().legend().setAlignment(alignment)
+                chart_view.chart().legend().show()
+
+
+if __name__ == "__main__":
+    app = QApplication(sys.argv)
+    window = QMainWindow()
+    widget = ThemeWidget(None)
+    window.setCentralWidget(widget)
+    available_geometry = app.desktop().availableGeometry(window)
+    size = available_geometry.height() * 0.75
+    window.setFixedSize(size, size * 0.8)
+    window.show()
+    sys.exit(app.exec_())
diff --git a/examples/charts/chartthemes/themewidget.ui b/examples/charts/chartthemes/themewidget.ui
new file mode 100644
index 000000000..9ea2bb7c4
--- /dev/null
+++ b/examples/charts/chartthemes/themewidget.ui
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ThemeWidgetForm</class>
+ <widget class="QWidget" name="ThemeWidgetForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>900</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="themeLabel">
+       <property name="text">
+        <string>Theme:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="themeComboBox"/>
+     </item>
+     <item>
+      <widget class="QLabel" name="animatedLabel">
+       <property name="text">
+        <string>Animation:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="animatedComboBox"/>
+     </item>
+     <item>
+      <widget class="QLabel" name="legendLabel">
+       <property name="text">
+        <string>Legend:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="legendComboBox"/>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="antialiasCheckBox">
+       <property name="text">
+        <string>Anti-aliasing</string>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>themeComboBox</sender>
+   <signal>currentIndexChanged(int)</signal>
+   <receiver>ThemeWidgetForm</receiver>
+   <slot>updateUI()</slot>
+  </connection>
+  <connection>
+   <sender>antialiasCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>ThemeWidgetForm</receiver>
+   <slot>updateUI()</slot>
+  </connection>
+  <connection>
+   <sender>legendComboBox</sender>
+   <signal>currentIndexChanged(int)</signal>
+   <receiver>ThemeWidgetForm</receiver>
+   <slot>updateUI()</slot>
+  </connection>
+  <connection>
+   <sender>animatedComboBox</sender>
+   <signal>currentIndexChanged(int)</signal>
+   <receiver>ThemeWidgetForm</receiver>
+   <slot>updateUI()</slot>
+  </connection>
+ </connections>
+ <slots>
+  <slot>updateUI()</slot>
+ </slots>
+</ui>
diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qquickview-ex.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qquickview-ex.cpp
new file mode 100644
index 000000000..380989e4e
--- /dev/null
+++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qquickview-ex.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of Qt for Python.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+if __name__ == '__main__':
+    app = QGuiApplication(sys.argv)
+    view = QQuickView()
+    view.setResizeMode(QQuickView.SizeRootObjectToView)
+
+    qmlFile = os.path.join(os.path.dirname(__file__), 'view.qml')
+    view.setSource(QUrl.fromLocalFile(os.path.abspath(qmlFile)))
+    if view.status() == QQuickView.Error:
+        sys.exit(-1)
+    view.show()
+
+    app.exec_()
+    # Deleting the view before it goes out of scope is required to make
+    # sure all child QML instances are destroyed in the correct order.
+    del view
+//! [0]
diff --git a/sources/pyside2/doc/qtattributionsscannertorst.py b/sources/pyside2/doc/qtattributionsscannertorst.py
index 54982c1a0..46a3ecb66 100644
--- a/sources/pyside2/doc/qtattributionsscannertorst.py
+++ b/sources/pyside2/doc/qtattributionsscannertorst.py
@@ -55,10 +55,6 @@ rstHeader="""Licenses Used in Qt for Python
 Qt for Python contains some code that is not provided under the
 GNU Lesser General Public License (LGPL) or the Qt Commercial License,
 but rather under specific licenses from the original authors.
-
-Qt for Python contains some code that is not provided under the
-GNU Lesser General Public License (LGPL) or the Qt Commercial License,
-but rather under specific licenses from the original authors.
 The Qt Company gratefully acknowledges these and other contributions
 to Qt for Python. We recommend that programs that use Qt for Python
 also acknowledge these contributions, and quote these license
diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp
index 11db70bb5..f4263403b 100644
--- a/sources/pyside2/libpyside/pysideqflags.cpp
+++ b/sources/pyside2/libpyside/pysideqflags.cpp
@@ -165,8 +165,8 @@ namespace QFlags
     PyTypeObject *create(const char* name, PyType_Slot numberMethods[])
     {
         char qualname[200];
-        strcpy(qualname, "PySide2.libpyside.");
-        strcat(qualname, name);
+        // PYSIDE-747: Here we insert now the full class name.
+        strcpy(qualname, name);
         // Careful: PyType_FromSpec does not allocate the string.
         PyType_Spec *newspec = new PyType_Spec;
         newspec->name = strdup(qualname);
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 568b5fd27..a9556fa4c 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -4483,8 +4483,13 @@ void CppGenerator::writeEnumInitialization(QTextStream& s, const AbstractMetaEnu
     if (!cppEnum->isAnonymous()) {
         FlagsTypeEntry* flags = enumTypeEntry->flags();
         if (flags) {
-            s << INDENT << cpythonTypeNameExt(flags) << " = PySide::QFlags::create(\"" << flags->flagsName() << "\", "
-              << cpythonEnumName(cppEnum) << "_number_slots);" << endl;
+            // The following could probably be made nicer:
+            // We need 'flags->flagsName()' with the full module/class path.
+            QString fullPath = getClassTargetFullName(cppEnum);
+            fullPath.truncate(fullPath.lastIndexOf(QLatin1Char('.')) + 1);
+            s << INDENT << cpythonTypeNameExt(flags) << " = PySide::QFlags::create(\""
+                << fullPath << flags->flagsName() << "\", "
+                << cpythonEnumName(cppEnum) << "_number_slots);" << endl;
         }
 
         enumVarTypeObj = cpythonTypeNameExt(enumTypeEntry);
diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
index 122e60e41..43c162dec 100644
--- a/sources/shiboken2/libshiboken/basewrapper.cpp
+++ b/sources/shiboken2/libshiboken/basewrapper.cpp
@@ -1302,7 +1302,7 @@ void removeParent(SbkObject* child, bool giveOwnershipBack, bool keepReference)
 
     ChildrenList& oldBrothers = pInfo->parent->d->parentInfo->children;
     // Verify if this child is part of parent list
-    ChildrenList::iterator iChild = std::find(oldBrothers.begin(), oldBrothers.end(), child);
+    auto iChild = oldBrothers.find(child);
     if (iChild == oldBrothers.end())
         return;