Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit ab185ab0 authored by Pedro Reis's avatar Pedro Reis

Fixed errors for merge

parent a2b05d40
......@@ -43,7 +43,6 @@ public:
void setConfiguration(KisColorSelectorConfiguration conf);
KisColorSelectorConfiguration configuration() const;
void setColor(const KoColor &color) override;
//void setViewManager(KisViewManager *kisview) override;
/// update icons when a theme update happens
void updateIcons();
......
......@@ -79,6 +79,7 @@ KisColorSelectorContainer::KisColorSelectorContainer(QWidget *parent) :
connect(this, SIGNAL(settingsChanged()), this, SLOT(updateSettings()));
connect(this, SIGNAL(settingsChanged()), m_minimalShadeSelector, SLOT(updateSettings()));
m_colorSelAction = KisActionRegistry::instance()->makeQAction("show_color_selector", this);
connect(m_colorSelAction, SIGNAL(triggered()), m_colorSelector, SLOT(showPopup()), Qt::UniqueConnection);
......
diff --git a/cmake/modules/FindPyQt5.py b/cmake/modules/FindPyQt5.py
index 5849f40868..a42ba6c624 100644
--- a/cmake/modules/FindPyQt5.py
+++ b/cmake/modules/FindPyQt5.py
@@ -2,7 +2,7 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-import sys
+import sys, site
import os
try:
@@ -41,7 +41,7 @@ except ValueError:
pass
# FIXME This next line is just a little bit too crude.
-pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
+pyqt_sip_dir = os.path.join(site.getsitepackages()[0], "PyQt5", "bindings")
print("pyqt_sip_dir:%s" % pyqt_sip_dir)
print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment