qscintilla2:moved into main for pisi 2.0

This commit is contained in:
2015-10-26 01:28:56 +02:00
parent 9862480fc0
commit ca056bd9c8
4 changed files with 27 additions and 43 deletions
@@ -1,10 +0,0 @@
--- Python/configure.py~ 2009-06-05 11:00:42.000000000 +0200
+++ Python/configure.py 2009-06-06 11:41:12.000000000 +0200
@@ -294,6 +294,7 @@
makefile.extra_include_dirs.append(opts.qsciincdir)
makefile.extra_lib_dirs.append(opts.qscilibdir)
makefile.extra_libs.append("qscintilla2")
+ makefile.extra_libs.append("python" + sys.version[0:3])
makefile.generate()
@@ -1,17 +0,0 @@
--- a/designer-Qt4/designer.pro 2011-06-13 14:16:23.000000000 +0200
+++ b/designer-Qt4/designer.pro 2012-10-28 18:05:40.000000000 +0100
@@ -4,6 +4,8 @@
TEMPLATE = lib
TARGET = qscintillaplugin
+INCLUDEPATH = ../Qt4Qt5
+
CONFIG += designer release plugin
HEADERS = qscintillaplugin.h
@@ -12,4 +14,4 @@
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
-LIBS += -lqscintilla2
+LIBS += -L../Qt4Qt5 -lqscintilla2