From e4395f3f680ec30ad6be4eadf7cf0e1ff64d7615 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 4 Dec 2020 11:14:27 +0100 Subject: Fix uic/rcc generating outdated export for Qt for Python Bump version to 6. Fixes: QTBUG-89124 Change-Id: Ifcf60552b5b6efb86f79da34da9c34b8efae9fa4 Reviewed-by: Cristian Maureira-Fredes (cherry picked from commit fc9cda5f08ac848e88f63dd4a07c08b2fbc6bf17) Reviewed-by: Qt Cherry-pick Bot --- src/tools/rcc/rcc.cpp | 2 +- src/tools/uic/python/pythonwriteimports.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/tools') 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. -- cgit v1.2.3