summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-12-04 11:14:27 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-12-04 11:30:10 +0100
commitfc9cda5f08ac848e88f63dd4a07c08b2fbc6bf17 (patch)
tree8d3adebbc24ee255c14662d040047242276dbfc9
parentb2ebc2268c1a4093b0771c92e53732a1ad332f1c (diff)
Fix uic/rcc generating outdated export for Qt for Pythonv6.0.06.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>
-rw-r--r--src/tools/rcc/rcc.cpp2
-rw-r--r--src/tools/uic/python/pythonwriteimports.cpp12
-rw-r--r--tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected2
-rw-r--r--tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected322
-rw-r--r--tests/auto/tools/uic/baseline/config.ui.py6
-rw-r--r--tests/auto/tools/uic/tst_uic.cpp6
6 files changed, 15 insertions, 15 deletions
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 4c463cf2a0..6317d13a35 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -1112,7 +1112,7 @@ bool RCCResourceLibrary::writeHeader()
writeByteArray(QT_VERSION_STR);
writeString("\n");
writeString("# WARNING! All changes made in this file will be lost!\n\n");
- writeString("from PySide2 import QtCore\n\n");
+ writeString("from PySide6 import QtCore\n\n");
break;
case Binary:
writeString("qres");
diff --git a/src/tools/uic/python/pythonwriteimports.cpp b/src/tools/uic/python/pythonwriteimports.cpp
index f8d5e96729..ed83222841 100644
--- a/src/tools/uic/python/pythonwriteimports.cpp
+++ b/src/tools/uic/python/pythonwriteimports.cpp
@@ -39,9 +39,9 @@
QT_BEGIN_NAMESPACE
static const char *standardImports =
-R"I(from PySide2.QtCore import *
-from PySide2.QtGui import *
-from PySide2.QtWidgets import *
+R"I(from PySide6.QtCore import *
+from PySide6.QtGui import *
+from PySide6.QtWidgets import *
)I";
// Change the name of a qrc file "dir/foo.qrc" file to the Python
@@ -113,17 +113,17 @@ void WriteImports::acceptCustomWidget(DomCustomWidget *node)
return; // Exclude namespaced names (just to make tests pass).
const QString &importModule = qtModuleOf(node);
auto &output = m_uic->output();
- // For starting importing PySide2 modules
+ // For starting importing PySide6 modules
if (!importModule.isEmpty()) {
output << "from ";
if (importModule.startsWith(QLatin1String("Qt")))
- output << "PySide2.";
+ output << "PySide6.";
output << importModule;
if (!className.isEmpty())
output << " import " << className << "\n\n";
} else {
// When the elementHeader is not set, we know it's the continuation
- // of a PySide2 import or a normal import of another module.
+ // of a PySide6 import or a normal import of another module.
if (!node->elementHeader() || node->elementHeader()->text().isEmpty()) {
output << "import " << className << '\n';
} else { // When we do have elementHeader, we know it's a relative import.
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();