From 25180730194bec25f915f32ab846ea583fb1493f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 2 Nov 2020 16:11:52 +0100 Subject: Rename PySide2 to PySide6 Adapt CMake files, build scripts, tests and examples. Task-number: PYSIDE-904 Change-Id: I845f7b006e9ad274fed5444ec4c1f9dbe176ff88 Reviewed-by: Christian Tismer --- examples/webenginewidgets/simplebrowser.py | 12 ++++++------ examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py | 10 +++++----- .../webenginewidgets/tabbedbrowser/browsertabwidget.py | 8 ++++---- examples/webenginewidgets/tabbedbrowser/downloadwidget.py | 12 ++++++------ examples/webenginewidgets/tabbedbrowser/findtoolbar.py | 10 +++++----- examples/webenginewidgets/tabbedbrowser/historywindow.py | 4 ++-- examples/webenginewidgets/tabbedbrowser/main.py | 14 +++++++------- examples/webenginewidgets/tabbedbrowser/webengineview.py | 4 ++-- 8 files changed, 37 insertions(+), 37 deletions(-) (limited to 'examples/webenginewidgets') diff --git a/examples/webenginewidgets/simplebrowser.py b/examples/webenginewidgets/simplebrowser.py index 365e69a05..8c5ec0704 100644 --- a/examples/webenginewidgets/simplebrowser.py +++ b/examples/webenginewidgets/simplebrowser.py @@ -39,21 +39,21 @@ ## ############################################################################# -"""PySide2 WebEngineWidgets Example""" +"""PySide6 WebEngineWidgets Example""" import sys -from PySide2.QtCore import QUrl -from PySide2.QtGui import QIcon -from PySide2.QtWidgets import (QApplication, QLineEdit, +from PySide6.QtCore import QUrl +from PySide6.QtGui import QIcon +from PySide6.QtWidgets import (QApplication, QLineEdit, QMainWindow, QPushButton, QToolBar) -from PySide2.QtWebEngineWidgets import QWebEnginePage, QWebEngineView +from PySide6.QtWebEngineWidgets import QWebEnginePage, QWebEngineView class MainWindow(QMainWindow): def __init__(self): super(MainWindow, self).__init__() - self.setWindowTitle('PySide2 WebEngineWidgets Example') + self.setWindowTitle('PySide6 WebEngineWidgets Example') self.toolBar = QToolBar() self.addToolBar(self.toolBar) diff --git a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py index 612c682cb..88ef74367 100644 --- a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py @@ -42,10 +42,10 @@ import json import os import warnings -from PySide2 import QtCore -from PySide2.QtCore import QDir, QFileInfo, QStandardPaths, Qt, QUrl -from PySide2.QtGui import QIcon, QStandardItem, QStandardItemModel -from PySide2.QtWidgets import QMenu, QMessageBox, QTreeView +from PySide6 import QtCore +from PySide6.QtCore import QDir, QFileInfo, QStandardPaths, Qt, QUrl +from PySide6.QtGui import QIcon, QStandardItem, QStandardItemModel +from PySide6.QtWidgets import QMenu, QMessageBox, QTreeView _url_role = Qt.UserRole + 1 @@ -58,7 +58,7 @@ _default_bookmarks = [ ['https://doc.qt.io/qtforpython/', 'Documentation'], ['https://bugreports.qt.io/projects/PYSIDE/', 'Bug Reports'], ['https://www.python.org/', 'Python', None], - ['https://wiki.qt.io/PySide2', 'Qt for Python', None], + ['https://wiki.qt.io/PySide6', 'Qt for Python', None], ['Other Bookmarks'] ] diff --git a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py index 093eed6bb..00b7750f7 100644 --- a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py @@ -43,10 +43,10 @@ from functools import partial from bookmarkwidget import BookmarkWidget from webengineview import WebEngineView from historywindow import HistoryWindow -from PySide2 import QtCore -from PySide2.QtCore import Qt, QUrl -from PySide2.QtWidgets import QMenu, QTabBar, QTabWidget -from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage +from PySide6 import QtCore +from PySide6.QtCore import Qt, QUrl +from PySide6.QtWidgets import QMenu, QTabBar, QTabWidget +from PySide6.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage class BrowserTabWidget(QTabWidget): diff --git a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py index 73b8d116b..a773070a1 100644 --- a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py @@ -39,11 +39,11 @@ ############################################################################# import sys -from PySide2 import QtCore -from PySide2.QtCore import QDir, QFileInfo, QStandardPaths, Qt, QUrl -from PySide2.QtGui import QDesktopServices -from PySide2.QtWidgets import QMenu, QProgressBar, QStyleFactory -from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem +from PySide6 import QtCore +from PySide6.QtCore import QDir, QFileInfo, QStandardPaths, Qt, QUrl +from PySide6.QtGui import QDesktopServices +from PySide6.QtWidgets import QMenu, QProgressBar, QStyleFactory +from PySide6.QtWebEngineWidgets import QWebEngineDownloadItem # A QProgressBar with context menu for displaying downloads in a QStatusBar. @@ -60,7 +60,7 @@ class DownloadWidget(QProgressBar): download_item.stateChanged.connect(self._update_tool_tip()) path = download_item.path() self.setMaximumWidth(300) - # Shorten 'PySide2-5.11.0a1-5.11.0-cp36-cp36m-linux_x86_64.whl'... + # Shorten 'PySide6-5.11.0a1-5.11.0-cp36-cp36m-linux_x86_64.whl'... description = QFileInfo(path).fileName() description_length = len(description) if description_length > 30: diff --git a/examples/webenginewidgets/tabbedbrowser/findtoolbar.py b/examples/webenginewidgets/tabbedbrowser/findtoolbar.py index 3557c2e31..ec52e9073 100644 --- a/examples/webenginewidgets/tabbedbrowser/findtoolbar.py +++ b/examples/webenginewidgets/tabbedbrowser/findtoolbar.py @@ -38,11 +38,11 @@ ## ############################################################################# -from PySide2 import QtCore -from PySide2.QtCore import Qt -from PySide2.QtGui import QIcon, QKeySequence -from PySide2.QtWidgets import QCheckBox, QLineEdit, QToolBar, QToolButton -from PySide2.QtWebEngineWidgets import QWebEnginePage +from PySide6 import QtCore +from PySide6.QtCore import Qt +from PySide6.QtGui import QIcon, QKeySequence +from PySide6.QtWidgets import QCheckBox, QLineEdit, QToolBar, QToolButton +from PySide6.QtWebEngineWidgets import QWebEnginePage # A Find tool bar (bottom area) diff --git a/examples/webenginewidgets/tabbedbrowser/historywindow.py b/examples/webenginewidgets/tabbedbrowser/historywindow.py index 6ce779743..e0f381962 100644 --- a/examples/webenginewidgets/tabbedbrowser/historywindow.py +++ b/examples/webenginewidgets/tabbedbrowser/historywindow.py @@ -38,9 +38,9 @@ ## ############################################################################# -from PySide2.QtWidgets import QApplication, QTreeView +from PySide6.QtWidgets import QApplication, QTreeView -from PySide2.QtCore import Signal, QAbstractTableModel, QModelIndex, Qt, QUrl +from PySide6.QtCore import Signal, QAbstractTableModel, QModelIndex, Qt, QUrl class HistoryModel(QAbstractTableModel): diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py index 086946bac..388f3b2ec 100644 --- a/examples/webenginewidgets/tabbedbrowser/main.py +++ b/examples/webenginewidgets/tabbedbrowser/main.py @@ -39,7 +39,7 @@ ## ############################################################################# -"""PySide2 WebEngineWidgets Example""" +"""PySide6 WebEngineWidgets Example""" import sys from bookmarkwidget import BookmarkWidget @@ -47,12 +47,12 @@ from browsertabwidget import BrowserTabWidget from downloadwidget import DownloadWidget from findtoolbar import FindToolBar from webengineview import WebEngineView -from PySide2 import QtCore -from PySide2.QtCore import Qt, QUrl -from PySide2.QtGui import QAction, QKeySequence, QIcon -from PySide2.QtWidgets import (QApplication, QDockWidget, QLabel, +from PySide6 import QtCore +from PySide6.QtCore import Qt, QUrl +from PySide6.QtGui import QAction, QKeySequence, QIcon +from PySide6.QtWidgets import (QApplication, QDockWidget, QLabel, QLineEdit, QMainWindow, QToolBar) -from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage +from PySide6.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage main_windows = [] @@ -82,7 +82,7 @@ class MainWindow(QMainWindow): def __init__(self): super(MainWindow, self).__init__() - self.setWindowTitle('PySide2 tabbed browser Example') + self.setWindowTitle('PySide6 tabbed browser Example') self._tab_widget = BrowserTabWidget(create_main_window_with_browser) self._tab_widget.enabled_changed.connect(self._enabled_changed) diff --git a/examples/webenginewidgets/tabbedbrowser/webengineview.py b/examples/webenginewidgets/tabbedbrowser/webengineview.py index 81b156f93..d7eba1246 100644 --- a/examples/webenginewidgets/tabbedbrowser/webengineview.py +++ b/examples/webenginewidgets/tabbedbrowser/webengineview.py @@ -38,9 +38,9 @@ ## ############################################################################# -from PySide2.QtWebEngineWidgets import QWebEnginePage, QWebEngineView +from PySide6.QtWebEngineWidgets import QWebEnginePage, QWebEngineView -from PySide2 import QtCore +from PySide6 import QtCore _web_actions = [QWebEnginePage.Back, QWebEnginePage.Forward, QWebEnginePage.Reload, -- cgit v1.2.3