1 files changed, 21 insertions, 7 deletions

diff --git a/tools/perf/scripts/python/exported-sql-viewer.py b/tools/perf/scripts/python/exported-sql-viewer.py
index 498b79454012..6fe553258ce5 100755
--- a/tools/perf/scripts/python/exported-sql-viewer.py
+++ b/tools/perf/scripts/python/exported-sql-viewer.py
@@ -105,10 +105,23 @@ except ImportError:
         glb_nsz = 16
 import re
 import os
-from PySide.QtCore import *
-from PySide.QtGui import *
-from PySide.QtSql import *
+
 pyside_version_1 = True
+if not "--pyside-version-1" in sys.argv:
+        try:
+                from PySide2.QtCore import *
+                from PySide2.QtGui import *
+                from PySide2.QtSql import *
+                from PySide2.QtWidgets import *
+                pyside_version_1 = False
+        except:
+                pass
+
+if pyside_version_1:
+        from PySide.QtCore import *
+        from PySide.QtGui import *
+        from PySide.QtSql import *
+
 from decimal import *
 from ctypes import *
 from multiprocessing import Process, Array, Value, Event
@@ -2755,7 +2768,7 @@ class WindowMenu():
                         action = self.window_menu.addAction(label)
                         action.setCheckable(True)
                         action.setChecked(sub_window == self.mdi_area.activeSubWindow())
-                        action.triggered.connect(lambda x=nr: self.setActiveSubWindow(x))
+                        action.triggered.connect(lambda a=None,x=nr: self.setActiveSubWindow(x))
                         self.window_menu.addAction(action)
                         nr += 1
 
@@ -3115,14 +3128,14 @@ class MainWindow(QMainWindow):
                         event = event.split(":")[0]
                         if event == "branches":
                                 label = "All branches" if branches_events == 1 else "All branches " + "(id=" + dbid + ")"
-                                reports_menu.addAction(CreateAction(label, "Create a new window displaying branch events", lambda x=dbid: self.NewBranchView(x), self))
+                                reports_menu.addAction(CreateAction(label, "Create a new window displaying branch events", lambda a=None,x=dbid: self.NewBranchView(x), self))
                                 label = "Selected branches" if branches_events == 1 else "Selected branches " + "(id=" + dbid + ")"
-                                reports_menu.addAction(CreateAction(label, "Create a new window displaying branch events", lambda x=dbid: self.NewSelectedBranchView(x), self))
+                                reports_menu.addAction(CreateAction(label, "Create a new window displaying branch events", lambda a=None,x=dbid: self.NewSelectedBranchView(x), self))
 
         def TableMenu(self, tables, menu):
                 table_menu = menu.addMenu("&Tables")
                 for table in tables:
-                        table_menu.addAction(CreateAction(table, "Create a new window containing a table view", lambda t=table: self.NewTableView(t), self))
+                        table_menu.addAction(CreateAction(table, "Create a new window containing a table view", lambda a=None,t=table: self.NewTableView(t), self))
 
         def NewCallGraph(self):
                 CallGraphWindow(self.glb, self)
@@ -3365,6 +3378,7 @@ def Main():
         usage_str =     "exported-sql-viewer.py [--pyside-version-1] <database name>\n" \
                         "   or: exported-sql-viewer.py --help-only"
         ap = argparse.ArgumentParser(usage = usage_str, add_help = False)
+        ap.add_argument("--pyside-version-1", action='store_true')
         ap.add_argument("dbname", nargs="?")
         ap.add_argument("--help-only", action='store_true')
         args = ap.parse_args()