diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-04 11:14:27 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-04 11:30:10 +0100 |
| commit | fc9cda5f08ac848e88f63dd4a07c08b2fbc6bf17 (patch) | |
| tree | 8d3adebbc24ee255c14662d040047242276dbfc9 /tests/auto/tools | |
| parent | b2ebc2268c1a4093b0771c92e53732a1ad332f1c (diff) | |
Fix uic/rcc generating outdated export for Qt for Pythonv6.0.0
Bump version to 6.
Pick-to: dev 6.0
Fixes: QTBUG-89124
Change-Id: Ifcf60552b5b6efb86f79da34da9c34b8efae9fa4
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'tests/auto/tools')
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected index 99ef16c226..366cd20e33 100644 --- a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected +++ b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected @@ -3,7 +3,7 @@ # Created by: The Resource Compiler for Qt version 6.0.0 # WARNING! All changes made in this file will be lost! -from PySide2 import QtCore +from PySide6 import QtCore qt_resource_data = b"\ \x00\x00\x00#\ diff --git a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected32 b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected32 index c1c6b29fe8..1d47fa5d30 100644 --- a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected32 +++ b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected32 @@ -3,7 +3,7 @@ # Created by: The Resource Compiler for Qt version 6.0.0 # WARNING! All changes made in this file will be lost! -from PySide2 import QtCore +from PySide6 import QtCore qt_resource_data = b"\ \x00\x00\x00#\ diff --git a/tests/auto/tools/uic/baseline/config.ui.py b/tests/auto/tools/uic/baseline/config.ui.py index be8e939f5e..961c2cebd6 100644 --- a/tests/auto/tools/uic/baseline/config.ui.py +++ b/tests/auto/tools/uic/baseline/config.ui.py @@ -36,9 +36,9 @@ ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide2.QtCore import * -from PySide2.QtGui import * -from PySide2.QtWidgets import * +from PySide6.QtCore import * +from PySide6.QtGui import * +from PySide6.QtWidgets import * from gammaview import GammaView diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp index 07e508997d..0a07948dc2 100644 --- a/tests/auto/tools/uic/tst_uic.cpp +++ b/tests/auto/tools/uic/tst_uic.cpp @@ -117,7 +117,7 @@ static QByteArray msgProcessStartFailed(const QString &command, const QString &w return result.toLocal8Bit(); } -// Locate Python and check whether PySide2 is installed +// Locate Python and check whether PySide6 is installed static QString locatePython(QTemporaryDir &generatedDir) { QString python = QStandardPaths::findExecutable(QLatin1String("python")); @@ -128,7 +128,7 @@ static QString locatePython(QTemporaryDir &generatedDir) QFile importTestFile(generatedDir.filePath(QLatin1String("import_test.py"))); if (!importTestFile.open(QIODevice::WriteOnly| QIODevice::Text)) return QString(); - importTestFile.write("import PySide2.QtCore\n"); + importTestFile.write("import PySide6.QtCore\n"); importTestFile.close(); QProcess process; process.start(python, {importTestFile.fileName()}); @@ -136,7 +136,7 @@ static QString locatePython(QTemporaryDir &generatedDir) return QString(); if (process.exitStatus() != QProcess::NormalExit || process.exitCode() != 0) { const QString stdErr = QString::fromLocal8Bit(process.readAllStandardError()).simplified(); - qWarning("PySide2 is not installed (%s)", qPrintable(stdErr)); + qWarning("PySide6 is not installed (%s)", qPrintable(stdErr)); return QString(); } importTestFile.remove(); |