From f6bc0ea88ffc93459eba56a1f1872099500405a0 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 16 Mar 2018 16:57:06 +1100 Subject: Backport: Remove line-end white space. Backport of changeset 6625:2dd6b8049c4e. --- qt/ScintillaEditPy/README | 22 +++++++++++----------- .../typesystem_ScintillaEdit.xml.template | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'qt/ScintillaEditPy') diff --git a/qt/ScintillaEditPy/README b/qt/ScintillaEditPy/README index a9f4fbef1..d0c653d20 100644 --- a/qt/ScintillaEditPy/README +++ b/qt/ScintillaEditPy/README @@ -4,7 +4,7 @@ This directory is for building a Python encapsulation of Scintilla for use with PySide. For C++ libraries see the README in the parent directory. Prerequisites - + PySide and ScintillaEditPy currently only support Python 2.x. CMake may be used to rebuild PySide and is required on Windows. @@ -30,16 +30,16 @@ The qmake program may be called qmake-qt5 or qmake-qt4. It can be found with: which qmake-qt5 || which qmake-qt4 || which qmake -On Windows, the PySide library packages can be downloaded from +On Windows, the PySide library packages can be downloaded from http://developer.qt.nokia.com/wiki/PySide_Binaries_Windows -The PySide development files must be built from source using CMake as +The PySide development files must be built from source using CMake as described on the PySide site. This will create a Unix-style set of [bin, include, -lib, and share] directories in packaging\setuptools\install-py-qt. +lib, and share] directories in packaging\setuptools\install-py-qt. There is no standard place for the PySide development files so copy them to "\usr", creating it if needed. On OS X, a combined package with PySide libraries and PySide development -files can be downloaded from +files can be downloaded from http://developer.qt.nokia.com/wiki/PySide_Binaries_MacOSX This package works best in combination with the Qt libraries for Mac from http://qt.nokia.com/downloads/downloads#qt-lib @@ -54,21 +54,21 @@ script which is run: python sepbuild.py -This script first runs the WidgetGen.py script to fill out the ScintillaEdit.h, +This script first runs the WidgetGen.py script to fill out the ScintillaEdit.h, ScintillaEdit.cpp and ScintillaConstants.py files. -A short file "sepbuild.pri" is written out which contains a series of version and +A short file "sepbuild.pri" is written out which contains a series of version and path properties discovered by sepbuild.py which are used by qmake. Then it runs PySide's "shiboken" program to create C++ code that will act as a -bridge between Python and the C++ libraries. This code goes into the +bridge between Python and the C++ libraries. This code goes into the ScintillaEditPy/ScintillaEditPy directory. Several log files are produced which can help uncover problems in the bridge if it fails to build. The qmake program is run to produce make files from ScintillaEditPy.pro. The system make program is then run to build the library. The library is located in -the scintilla/bin directory as ScintillaEditPy.so for Unix systems and +the scintilla/bin directory as ScintillaEditPy.so for Unix systems and ScintillaEditPy.pyd for Windows. A demonstration program can be run: @@ -76,12 +76,12 @@ A demonstration program can be run: python testsepq.py The individual steps in the script can be run manually if wanted although the -shiboken program has complex arguments and differs between systems so run +shiboken program has complex arguments and differs between systems so run sepbuild.py and copy the section starting with a line containing "generatorrunner" and continuing to "typesystem_ScintillaEdit.xml". On Windows, it is more difficult to set up an environment to debug ScintillaEditPy -since all the libraries have to be debug or all have to be release. The easy path +since all the libraries have to be debug or all have to be release. The easy path is to always build for release with "nmake release". To remove generated code, run "python sepbuild.py --clean". diff --git a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template index f9f166e56..f7196a274 100644 --- a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template +++ b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template @@ -11,9 +11,9 @@ - - -- cgit v1.2.3