Commit 77d1b16c authored by Scott Kitterman's avatar Scott Kitterman

Imported Upstream version 2.10.4+dfsg

parent 832febe9
2018-04-10 Phil Thompson <phil@riverbankcomputing.com>
* NEWS:
Released as v2.10.4.
[24cb0edc89a9] [2.10.4] <2.10-maint>
* qt/SciAccessibility.cpp:
Fixed the retrieval of accessibility attributes.
[e430a7dd7818] <2.10-maint>
2018-04-07 Phil Thompson <phil@riverbankcomputing.com>
* qt/qscilexer.cpp:
Use STYLE_MAX to define the maximum number of styles.
[23ca0cad0227] <2.10-maint>
2018-03-11 Phil Thompson <phil@riverbankcomputing.com>
* qt/qscintilla.pro:
Force QT_NO_ACCESSIBILITY when building against Qt4.
[b65f48ec1852] <2.10-maint>
2018-02-27 Phil Thompson <phil@riverbankcomputing.com>
* .hgtags:
Added tag 2.10.3 for changeset bc769d6fcf53
[279625f1d8c9] <2.10-maint>
* NEWS:
Released as v2.10.3.
[bc769d6fcf53] [2.10.3] <2.10-maint>
* rb-product:
Updated the PyQt5 wheel dependency.
[7cef6e297ddf] <2.10-maint>
* NEWS:
Updated the NEWS file.
[1e073e29eca4] <2.10-maint>
2018-02-10 Phil Thompson <phil@riverbankcomputing.com>
* qsci/api/python/Python-3.7.api:
Added the API file for Python v3.70b1.
[6d0032674462] <2.10-maint>
2018-02-07 Phil Thompson <phil@riverbankcomputing.com>
* qt/qsciscintilla.cpp:
Fix the hotspot active background colour.
[45cfd8c68394] <2.10-maint>
* qt/SciAccessibility.cpp, qt/SciAccessibility.h:
Completed the accessibility support.
[2af3a5b045fa] <2.10-maint>
2018-02-06 Phil Thompson <phil@riverbankcomputing.com>
* qt/SciAccessibility.cpp, qt/SciAccessibility.h:
Implemented all of the accessible interface except for attributes().
[434539a243dc] <2.10-maint>
* qt/SciAccessibility.cpp:
Implemented more of the accessible interface.
[e8f3df5442cc] <2.10-maint>
* qt/SciAccessibility.cpp, qt/SciAccessibility.h, qt/ScintillaQt.cpp:
Implemented more of the accessible interface.
[fb26d9fdba27] <2.10-maint>
2018-02-05 Phil Thompson <phil@riverbankcomputing.com>
* qt/SciAccessibility.cpp, qt/SciAccessibility.h, qt/ScintillaQt.cpp,
qt/qsciscintillabase.cpp:
More accessibility progress.
[ea2432348b49] <2.10-maint>
* qt/SciAccessibility.cpp, qt/SciAccessibility.h, qt/ScintillaQt.cpp:
Some progress on accessibility.
[055345b62d7b] <2.10-maint>
* qt/qscintilla.pro:
Updated the version of the shared library.
[fb50133f8770] <2.10-maint>
2018-02-04 Phil Thompson <phil@riverbankcomputing.com>
* qt/SciAccessibility.cpp, qt/SciAccessibility.h, qt/qscintilla.pro,
qt/qsciscintillabase.cpp:
Added the stubs for accessibility support.
[61e00a4f944f] <2.10-maint>
2017-11-23 Phil Thompson <phil@riverbankcomputing.com>
* .hgtags:
Added tag 2.10.2 for changeset bdfb9584af36
[d127fc44d4c4] <2.10-maint>
* NEWS:
Released as v2.10.2.
[bdfb9584af36] [2.10.2] <2.10-maint>
......
v2.10.4 10th April 2018
- Bug fixes.
v2.10.3 26th February 2018
- Added accessibility support.
- Added the API file for Python v3.7.
v2.10.2 23rd November 2017
- Added setScrollWidth() , scrollWidth, setScrollWidthTracking() and
scrollWidthTracking() to QsciScintilla.
......
# This script configures QScintilla for PyQt v3 and/or v4.
#
# Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
# Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
#
# This file is part of QScintilla.
#
......@@ -77,7 +77,7 @@ def create_optparser():
setattr(parser.values, option.dest, os.path.abspath(value))
p = optparse.OptionParser(usage="python %prog [options]",
version="2.10.2")
version="2.10.4")
p.add_option("-a", "--apidir", action="callback", default=None,
type="string", metavar="DIR", dest="qscidir",
......@@ -177,8 +177,8 @@ def check_qscintilla():
# Because we include the Python bindings with the C++ code we can
# reasonably force the same version to be used and not bother about
# versioning.
if sciversstr != "2.10.2":
sipconfig.error("QScintilla %s is being used but the Python bindings 2.10.2 are being built. Please use matching versions." % sciversstr)
if sciversstr != "2.10.4":
sipconfig.error("QScintilla %s is being used but the Python bindings 2.10.4 are being built. Please use matching versions." % sciversstr)
sipconfig.inform("QScintilla %s is being used." % sciversstr)
else:
......
......@@ -23,7 +23,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# This is v2.2 of this boilerplate.
# This is v2.3 of this boilerplate.
from distutils import sysconfig
......@@ -60,7 +60,7 @@ class ModuleConfiguration(object):
# The version of the module as a string. Set it to None if you don't
# provide version information.
version = '2.10.2'
version = '2.10.4'
# Set if a configuration script is provided that handles versions of PyQt4
# prior to v4.10 (i.e. versions where the pyqtconfig.py module is
......@@ -646,8 +646,22 @@ class _HostPythonConfiguration:
self.debug = hasattr(sys, 'gettotalrefcount')
if sys.platform == 'win32':
try:
# Python v3.3 and later.
base_prefix = sys.base_prefix
except AttributeError:
try:
# virtualenv for Python v2.
base_prefix = sys.real_prefix
except AttributeError:
# We can't detect the base prefix in Python v3 prior to
# v3.3.
base_prefix = sys.prefix
self.data_dir = sys.prefix
self.lib_dir = sys.prefix + '\\libs'
self.lib_dir = base_prefix + '\\libs'
else:
self.data_dir = sys.prefix + '/share'
self.lib_dir = sys.prefix + '/lib'
......
// This is the SIP interface definition for QsciAbstractAPIs.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciAPIs.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciCommand.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for the QsciCommandSet.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciDocument.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexer.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerAVS.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerBash.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerBatch.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerCMake.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerCoffeeScript.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerCPP.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerCSharp.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerCSS.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerCustom.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerD.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerDiff.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerFortran.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerFortran77.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerHTML.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerIDL.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerJava.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerJavaScript.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerJSON.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerLua.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerMakefile.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerMarkdown.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerMatlab.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerOctave.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerPascal.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerPerl.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerPO.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerPostScript.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerPOV.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerProperties.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerPython.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerRuby.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerSpice.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerSQL.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerTCL.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerTeX.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerVerilog.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerVHDL.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerXML.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciLexerYAML.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for QsciMacro.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for the Qsci module of PyQt4.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for the Qsci module of PyQt5.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......
// This is the SIP interface definition for the parts of the Qsci module common
// to the PyQt v4 and v5 versions.
//
// Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
//
// This file is part of QScintilla.
//
......@@ -20,7 +20,7 @@
%Copying