Merge branches 'fix-none-pixmap-using-pyqt', 'katana-partial-qicon-fix' and 'qt5-screen-grab'

See in order on https://github.com:
- shotgunsoftware/pull/92 to match
  wwfxuk/tk-framework-qtwidgets/tree/v2.8.3%2Bwwfx.1.0.0
- /pull/2 to match
  wwfxuk/tk-framework-qtwidgets/tree/v2.8.3%2Bwwfx.1.1.0
- shotgunsoftware/pull/105 to match
  wwfxuk/tk-framework-qtwidgets/tree/v2.8.5%2Bwwfx.1.0.2

Author: Joseph Yu

python/context_selector/context_widget.py

@@ -8,6 +8,7 @@
 # agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
 # not expressly granted therein are reserved by Shotgun Software Inc.
 
+from functools import partial
 import os
 import sgtk
 from sgtk.platform.qt import QtCore, QtGui
@@ -487,7 +488,12 @@ def _get_qaction_for_context(self, context):
         action.setText(context_display)
         action.setIcon(QtGui.QIcon(icon_path))
         action.setData(context)
-        action.triggered.connect(lambda: self._on_context_activated(context))
+
+        def run_on_context_activated(context):
+            self._on_context_activated(context)
+
+        func = partial(run_on_context_activated, context)
+        action.triggered.connect(func)
 
         return action
 

python/screen_grab/screen_grab.py

@@ -15,6 +15,8 @@
 from sgtk.platform.qt import QtCore, QtGui
 import sgtk
 
+QT_MAJOR = int(QtCore.qVersion().split(".")[0])  # Works for PySide* and PyQt*
+
 
 class ScreenGrabber(QtGui.QDialog):
     """
@@ -332,10 +334,19 @@ def get_desktop_pixmap(rect):
     :returns: Captured image
     :rtype: :class:`~PySide.QtGui.QPixmap`
     """
-    desktop = QtGui.QApplication.desktop()
-    return QtGui.QPixmap.grabWindow(
-        desktop.winId(), rect.x(), rect.y(), rect.width(), rect.height()
-    )
+    x_y_w_h = rect.x(), rect.y(), rect.width(), rect.height()
+
+    if QT_MAJOR == 5:
+        screen = QtGui.QApplication.primaryScreen()
+        pixmap = screen.grabWindow(0, *x_y_w_h)
+    elif QT_MAJOR == 4:
+        desktop = QtGui.QApplication.desktop()
+        pixmap = QtGui.QPixmap.grabWindow(desktop.winId(), *x_y_w_h)
+    else:
+        message = "Screen capture not implmented for Qt %d"
+        raise NotImplementedError(message % QT_MAJOR)
+
+    return pixmap
 
 
 # Backwards compatibility, as this used to be a module-level

python/search_completer/global_search_completer.py

@@ -202,7 +202,7 @@ def _handle_search_results(self, data):
 
             item.setData(shotgun_model.sanitize_for_qt_model(d), self.SG_DATA_ROLE)
 
-            item.setIcon(self._pixmaps.no_thumbnail)
+            item.setIcon(QtGui.QIcon(self._pixmaps.no_thumbnail))
 
             if d.get("image") and self._sg_data_retriever:
                 uid = self._sg_data_retriever.request_thumbnail(