diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-20 09:46:46 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-23 09:44:34 +0100 |
commit | ef40fe132091e4384b1b1aa0bd5f156dad45eb22 (patch) | |
tree | f183ea8816f58015dbbc7defdcca950c2c183482 /examples | |
parent | cddb882c9281cf9b9205afab72e0d82f984cc0de (diff) | |
parent | 7173c67ab4c7fc8d49c1113e5caab9d4394ea285 (diff) |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'examples')
-rw-r--r-- | examples/axcontainer/axviewer.py | 2 | ||||
-rw-r--r-- | examples/multimedia/camera.py | 2 | ||||
-rw-r--r-- | examples/multimedia/player.py | 2 | ||||
-rw-r--r-- | examples/sql/books/bookwindow.py | 2 | ||||
-rw-r--r-- | examples/webenginewidgets/tabbedbrowser/main.py | 2 | ||||
-rw-r--r-- | examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/axcontainer/axviewer.py b/examples/axcontainer/axviewer.py index 8d0226394..e9083d8f4 100644 --- a/examples/axcontainer/axviewer.py +++ b/examples/axcontainer/axviewer.py @@ -43,7 +43,7 @@ import sys from PySide2.QtAxContainer import QAxSelect, QAxWidget -from PySide2.QtWidgets import (QAction, qApp, QApplication, QDialog, +from PySide2.QtWidgets import (QAction, QApplication, QDialog, QMainWindow, QMessageBox, QToolBar) class MainWindow(QMainWindow): diff --git a/examples/multimedia/camera.py b/examples/multimedia/camera.py index cd8d1cffc..d58b526d9 100644 --- a/examples/multimedia/camera.py +++ b/examples/multimedia/camera.py @@ -45,7 +45,7 @@ import os, sys from PySide2.QtCore import QDate, QDir, QStandardPaths, Qt, QUrl from PySide2.QtGui import QGuiApplication, QDesktopServices, QIcon from PySide2.QtGui import QImage, QPixmap -from PySide2.QtWidgets import (QAction, qApp, QApplication, QHBoxLayout, QLabel, +from PySide2.QtWidgets import (QAction, QApplication, QHBoxLayout, QLabel, QMainWindow, QPushButton, QTabWidget, QToolBar, QVBoxLayout, QWidget) from PySide2.QtMultimedia import QCamera, QCameraImageCapture, QCameraInfo from PySide2.QtMultimediaWidgets import QCameraViewfinder diff --git a/examples/multimedia/player.py b/examples/multimedia/player.py index ecf5c0793..cb70e50d6 100644 --- a/examples/multimedia/player.py +++ b/examples/multimedia/player.py @@ -44,7 +44,7 @@ import sys from PySide2.QtCore import QStandardPaths, Qt from PySide2.QtGui import QIcon, QKeySequence -from PySide2.QtWidgets import (QAction, qApp, QApplication, QDialog, QFileDialog, +from PySide2.QtWidgets import (QAction, QApplication, QDialog, QFileDialog, QMainWindow, QSlider, QStyle, QToolBar) from PySide2.QtMultimedia import QMediaPlayer, QMediaPlaylist from PySide2.QtMultimediaWidgets import QVideoWidget diff --git a/examples/sql/books/bookwindow.py b/examples/sql/books/bookwindow.py index 3bd56bc52..31d2a055f 100644 --- a/examples/sql/books/bookwindow.py +++ b/examples/sql/books/bookwindow.py @@ -40,7 +40,7 @@ from __future__ import print_function, absolute_import -from PySide2.QtWidgets import (QAbstractItemView, qApp, QDataWidgetMapper, +from PySide2.QtWidgets import (QAbstractItemView, QDataWidgetMapper, QHeaderView, QMainWindow, QMessageBox) from PySide2.QtGui import QKeySequence from PySide2.QtSql import QSqlRelation, QSqlRelationalTableModel, QSqlTableModel diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py index b17dea561..fe5e2e1c2 100644 --- a/examples/webenginewidgets/tabbedbrowser/main.py +++ b/examples/webenginewidgets/tabbedbrowser/main.py @@ -50,7 +50,7 @@ from webengineview import WebEngineView from PySide2 import QtCore from PySide2.QtCore import Qt, QUrl from PySide2.QtGui import QKeySequence, QIcon -from PySide2.QtWidgets import (qApp, QAction, QApplication, +from PySide2.QtWidgets import (QAction, QApplication, QDockWidget, QLabel, QLineEdit, QMainWindow, QToolBar) from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py index c9922f46e..55805e469 100644 --- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py +++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py @@ -47,7 +47,7 @@ import re from PySide2.QtCore import (QFile, Qt, QTextStream) from PySide2.QtGui import (QColor, QFont, QKeySequence, QSyntaxHighlighter, QTextCharFormat) -from PySide2.QtWidgets import (qApp, QApplication, QFileDialog, QMainWindow, +from PySide2.QtWidgets import (QApplication, QFileDialog, QMainWindow, QPlainTextEdit) import syntaxhighlighter_rc |