matplotlib
diff --git a/‎lib/matplotlib/backends/qt4_editor/formlayout.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/qt4_editor/formlayout.py
+24Lines changed: 24 additions & 0 deletions b/‎lib/matplotlib/backends/qt4_editor/formlayout.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backends/qt4_editor/formlayout.py
+24Lines changed: 24 additions & 0 deletions
@@ -92,17 +92,41 @@ def choose_color(self):
     def get_color(self):
         return self._color
 
+<<<<<<< HEAD
     @pyqtSignature("QColor")
+=======
+    @QtCore.Slot("QColor")
+>>>>>>> 8bba2a4... Merge pull request #2328 from mspacek/qtapi
     def set_color(self, color):
         if color != self._color:
             self._color = color
             self.emit(SIGNAL("colorChanged(QColor)"), self._color)
             pixmap = QPixmap(self.iconSize())
             pixmap.fill(color)
+<<<<<<< HEAD
             self.setIcon(QIcon(pixmap))
+=======
+            self.setIcon(QtGui.QIcon(pixmap))
+
+    color = QtCore.Property("QColor", get_color, set_color)
+>>>>>>> 8bba2a4... Merge pull request #2328 from mspacek/qtapi
 
     color = pyqtProperty("QColor", get_color, set_color)
 
+<<<<<<< HEAD
+=======
+def to_qcolor(color):
+    """Create a QColor from a matplotlib color"""
+    qcolor = QtGui.QColor()
+    color = str(color)
+    try:
+        color = col2hex(color)
+    except ValueError:
+        #print('WARNING: ignoring invalid color %r' % color)
+        return qcolor # return invalid QColor
+    qcolor.setNamedColor(color) # set using hex color
+    return qcolor # return valid QColor
+>>>>>>> 8bba2a4... Merge pull request #2328 from mspacek/qtapi
 
 def text_to_qcolor(text):
     """