diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-12 15:59:37 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-12 16:46:20 +0000 |
| commit | c499316c3c746602ecaa1a74c6387842d8261998 (patch) | |
| tree | 0592ede32726e9bb8919222e5e81b3ae8bb46dfa /sources/pyside6 | |
| parent | 08de60ee184f353e271d0fd788c0769ab57ec719 (diff) | |
Fix QtUiLoader
Fix compilation of the snippet (QStringView comparison)
Add includes of the dependent classes.
Change-Id: I048522e2a7b84e87bb8e54ac0c993d6c99fbe66c
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside6')
| -rw-r--r-- | sources/pyside6/PySide6/QtUiTools/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtUiTools/QtUiTools_global.pre.h.in | 7 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtuitools.cpp | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtUiTools/CMakeLists.txt b/sources/pyside6/PySide6/QtUiTools/CMakeLists.txt index 3275c4bef..e9258613b 100644 --- a/sources/pyside6/PySide6/QtUiTools/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtUiTools/CMakeLists.txt @@ -33,6 +33,10 @@ set(QtUiTools_libraries pyside6 ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES} ) set(QtUiTools_deps QtWidgets QtXml) + +configure_file("${QtUiTools_SOURCE_DIR}/QtUiTools_global.pre.h.in" + "${QtUiTools_BINARY_DIR}/QtUiTools_global.pre.h" @ONLY) + create_pyside_module(NAME QtUiTools INCLUDE_DIRS QtUiTools_include_dirs LIBRARIES QtUiTools_libraries diff --git a/sources/pyside6/PySide6/QtUiTools/QtUiTools_global.pre.h.in b/sources/pyside6/PySide6/QtUiTools/QtUiTools_global.pre.h.in new file mode 100644 index 000000000..addfe080f --- /dev/null +++ b/sources/pyside6/PySide6/QtUiTools/QtUiTools_global.pre.h.in @@ -0,0 +1,7 @@ +// Those classes are only forward-declared in QtUiLoader + +#include <QtWidgets/QLayout> +#include <QtWidgets/QWidget> +#include <QtGui/QAction> +#include <QtGui/QActionGroup> +#include <QtCore/QDir> diff --git a/sources/pyside6/PySide6/glue/qtuitools.cpp b/sources/pyside6/PySide6/glue/qtuitools.cpp index 1d9ffe9b2..40646e74b 100644 --- a/sources/pyside6/PySide6/glue/qtuitools.cpp +++ b/sources/pyside6/PySide6/glue/qtuitools.cpp @@ -175,7 +175,7 @@ if (!uiFile.open(QIODevice::ReadOnly)) QXmlStreamReader reader(&uiFile); while (!reader.atEnd() && baseClassName.isEmpty() && className.isEmpty()) { auto token = reader.readNext(); - if (token == QXmlStreamReader::StartElement && reader.name() == "widget") { + if (token == QXmlStreamReader::StartElement && reader.name() == u"widget") { baseClassName = reader.attributes().value(QLatin1String("class")).toUtf8(); className = reader.attributes().value(QLatin1String("name")).toUtf8(); } |