[Python-modules-commits] [qscintilla2] 01/14: Import qscintilla2_2.9.1+dfsg.orig.tar.gz
Scott Kitterman
kitterman at moszumanska.debian.org
Thu Oct 29 17:57:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
kitterman pushed a commit to branch master
in repository qscintilla2.
commit 6a58580f3e17567b23ed0e6699ffcf68ca3881d3
Author: Scott Kitterman <scott at kitterman.com>
Date: Thu Oct 29 13:03:07 2015 -0400
Import qscintilla2_2.9.1+dfsg.orig.tar.gz
---
ChangeLog | 82 +-
NEWS | 4 +
Python/configure-old.py | 6 +-
Python/configure.py | 29 +-
Python/sip/qsciabstractapis.sip | 2 +-
Python/sip/qsciapis.sip | 2 +-
Qt4Qt5/Qsci/qsciglobal.h | 4 +-
Qt4Qt5/qscintilla.pro | 38 +-
Qt4Qt5/qsciscintilla.cpp | 14 +-
designer-Qt4Qt5/qscintillaplugin.h | 2 +-
doc/html-Qt4Qt5/annotated.html | 4 +-
doc/html-Qt4Qt5/classQsciAPIs-members.html | 4 +-
doc/html-Qt4Qt5/classQsciAPIs.html | 4 +-
doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html | 4 +-
doc/html-Qt4Qt5/classQsciAbstractAPIs.html | 4 +-
doc/html-Qt4Qt5/classQsciCommand-members.html | 4 +-
doc/html-Qt4Qt5/classQsciCommand.html | 4 +-
doc/html-Qt4Qt5/classQsciCommandSet-members.html | 4 +-
doc/html-Qt4Qt5/classQsciCommandSet.html | 4 +-
doc/html-Qt4Qt5/classQsciDocument-members.html | 4 +-
doc/html-Qt4Qt5/classQsciDocument.html | 4 +-
doc/html-Qt4Qt5/classQsciLexer-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexer.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerAVS-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerAVS.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBash-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBash.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBatch-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerBatch.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCMake-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCMake.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCPP-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCPP.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSS-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSS.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSharp-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCSharp.html | 4 +-
.../classQsciLexerCoffeeScript-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCoffeeScript.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCustom-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerCustom.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerD-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerD.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerDiff-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerDiff.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerFortran-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerFortran.html | 4 +-
.../classQsciLexerFortran77-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerFortran77.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerHTML-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerHTML.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerIDL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerIDL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerJava-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerJava.html | 4 +-
.../classQsciLexerJavaScript-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerJavaScript.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerLua-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerLua.html | 4 +-
.../classQsciLexerMakefile-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerMakefile.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerMatlab-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerMatlab.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerOctave-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerOctave.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPO-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPO.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPOV-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPOV.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPascal-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPascal.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPerl-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPerl.html | 4 +-
.../classQsciLexerPostScript-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPostScript.html | 4 +-
.../classQsciLexerProperties-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerProperties.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPython-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerPython.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerRuby-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerRuby.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSQL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSQL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSpice-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerSpice.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTCL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTCL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTeX-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerTeX.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVHDL-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVHDL.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVerilog-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerVerilog.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerXML-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerXML.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerYAML-members.html | 4 +-
doc/html-Qt4Qt5/classQsciLexerYAML.html | 4 +-
doc/html-Qt4Qt5/classQsciMacro-members.html | 4 +-
doc/html-Qt4Qt5/classQsciMacro.html | 4 +-
doc/html-Qt4Qt5/classQsciPrinter-members.html | 4 +-
doc/html-Qt4Qt5/classQsciPrinter.html | 4 +-
doc/html-Qt4Qt5/classQsciScintilla-members.html | 4 +-
doc/html-Qt4Qt5/classQsciScintilla.html | 4 +-
.../classQsciScintillaBase-members.html | 4 +-
doc/html-Qt4Qt5/classQsciScintillaBase.html | 4 +-
doc/html-Qt4Qt5/classQsciStyle-members.html | 4 +-
doc/html-Qt4Qt5/classQsciStyle.html | 4 +-
doc/html-Qt4Qt5/classQsciStyledText-members.html | 4 +-
doc/html-Qt4Qt5/classQsciStyledText.html | 4 +-
doc/html-Qt4Qt5/classes.html | 4 +-
.../dir_7748dc2bc19d24806c9f0ac63a9f96c8.html | 4 +-
.../dir_a8871a339b4996dff2a2bca902b97660.html | 4 +-
doc/html-Qt4Qt5/dynsections.js | 97 -
doc/html-Qt4Qt5/functions.html | 4 +-
doc/html-Qt4Qt5/functions_b.html | 4 +-
doc/html-Qt4Qt5/functions_c.html | 4 +-
doc/html-Qt4Qt5/functions_d.html | 4 +-
doc/html-Qt4Qt5/functions_e.html | 4 +-
doc/html-Qt4Qt5/functions_enum.html | 4 +-
doc/html-Qt4Qt5/functions_eval.html | 4 +-
doc/html-Qt4Qt5/functions_eval_b.html | 4 +-
doc/html-Qt4Qt5/functions_eval_c.html | 4 +-
doc/html-Qt4Qt5/functions_eval_d.html | 4 +-
doc/html-Qt4Qt5/functions_eval_e.html | 4 +-
doc/html-Qt4Qt5/functions_eval_f.html | 4 +-
doc/html-Qt4Qt5/functions_eval_g.html | 4 +-
doc/html-Qt4Qt5/functions_eval_h.html | 4 +-
doc/html-Qt4Qt5/functions_eval_i.html | 4 +-
doc/html-Qt4Qt5/functions_eval_j.html | 4 +-
doc/html-Qt4Qt5/functions_eval_k.html | 4 +-
doc/html-Qt4Qt5/functions_eval_l.html | 4 +-
doc/html-Qt4Qt5/functions_eval_m.html | 4 +-
doc/html-Qt4Qt5/functions_eval_n.html | 4 +-
doc/html-Qt4Qt5/functions_eval_o.html | 4 +-
doc/html-Qt4Qt5/functions_eval_p.html | 4 +-
doc/html-Qt4Qt5/functions_eval_q.html | 4 +-
doc/html-Qt4Qt5/functions_eval_r.html | 4 +-
doc/html-Qt4Qt5/functions_eval_s.html | 4 +-
doc/html-Qt4Qt5/functions_eval_t.html | 4 +-
doc/html-Qt4Qt5/functions_eval_u.html | 4 +-
doc/html-Qt4Qt5/functions_eval_v.html | 4 +-
doc/html-Qt4Qt5/functions_eval_w.html | 4 +-
doc/html-Qt4Qt5/functions_eval_x.html | 4 +-
doc/html-Qt4Qt5/functions_eval_z.html | 4 +-
doc/html-Qt4Qt5/functions_f.html | 4 +-
doc/html-Qt4Qt5/functions_func.html | 4 +-
doc/html-Qt4Qt5/functions_func_b.html | 4 +-
doc/html-Qt4Qt5/functions_func_c.html | 4 +-
doc/html-Qt4Qt5/functions_func_d.html | 4 +-
doc/html-Qt4Qt5/functions_func_e.html | 4 +-
doc/html-Qt4Qt5/functions_func_f.html | 4 +-
doc/html-Qt4Qt5/functions_func_g.html | 4 +-
doc/html-Qt4Qt5/functions_func_h.html | 4 +-
doc/html-Qt4Qt5/functions_func_i.html | 4 +-
doc/html-Qt4Qt5/functions_func_k.html | 4 +-
doc/html-Qt4Qt5/functions_func_l.html | 4 +-
doc/html-Qt4Qt5/functions_func_m.html | 4 +-
doc/html-Qt4Qt5/functions_func_o.html | 4 +-
doc/html-Qt4Qt5/functions_func_p.html | 4 +-
doc/html-Qt4Qt5/functions_func_q.html | 4 +-
doc/html-Qt4Qt5/functions_func_r.html | 4 +-
doc/html-Qt4Qt5/functions_func_s.html | 4 +-
doc/html-Qt4Qt5/functions_func_t.html | 4 +-
doc/html-Qt4Qt5/functions_func_u.html | 4 +-
doc/html-Qt4Qt5/functions_func_v.html | 4 +-
doc/html-Qt4Qt5/functions_func_w.html | 4 +-
doc/html-Qt4Qt5/functions_func_z.html | 4 +-
doc/html-Qt4Qt5/functions_func_~.html | 4 +-
doc/html-Qt4Qt5/functions_g.html | 4 +-
doc/html-Qt4Qt5/functions_h.html | 4 +-
doc/html-Qt4Qt5/functions_i.html | 4 +-
doc/html-Qt4Qt5/functions_j.html | 4 +-
doc/html-Qt4Qt5/functions_k.html | 4 +-
doc/html-Qt4Qt5/functions_l.html | 4 +-
doc/html-Qt4Qt5/functions_m.html | 4 +-
doc/html-Qt4Qt5/functions_n.html | 4 +-
doc/html-Qt4Qt5/functions_o.html | 4 +-
doc/html-Qt4Qt5/functions_p.html | 4 +-
doc/html-Qt4Qt5/functions_q.html | 4 +-
doc/html-Qt4Qt5/functions_r.html | 4 +-
doc/html-Qt4Qt5/functions_s.html | 4 +-
doc/html-Qt4Qt5/functions_t.html | 4 +-
doc/html-Qt4Qt5/functions_u.html | 4 +-
doc/html-Qt4Qt5/functions_v.html | 4 +-
doc/html-Qt4Qt5/functions_w.html | 4 +-
doc/html-Qt4Qt5/functions_x.html | 4 +-
doc/html-Qt4Qt5/functions_z.html | 4 +-
doc/html-Qt4Qt5/functions_~.html | 4 +-
doc/html-Qt4Qt5/hierarchy.html | 4 +-
doc/html-Qt4Qt5/index.html | 4 +-
doc/qscintilla-Qt4Qt5.dxy | 2 +-
qsci/api/python/Python-3.5.api | 9717 ++++++++++++++++++++
192 files changed, 10204 insertions(+), 511 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 823e537..0a28053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,88 @@
+2015-10-24 Phil Thompson <phil at riverbankcomputing.com>
+
+ * .hgtags:
+ Added tag 2.9.1 for changeset 9bd39be91ef8
+ [c71bd22d6ccf] [tip] <2.9-maint>
+
+ * NEWS:
+ Released as v2.9.1.
+ [9bd39be91ef8] [2.9.1] <2.9-maint>
+
+2015-10-17 Phil Thompson <phil at riverbankcomputing.com>
+
+ * qt/qsciscintilla.cpp:
+ Fixed the handling of the keypad modifier.
+ [e363cc2c347f] <2.9-maint>
+
+2015-09-18 Phil Thompson <phil at riverbankcomputing.com>
+
+ * qsci/api/python/Python-3.5.api:
+ Added the .api file for Python v3.5.
+ [5b4e58de4663] <2.9-maint>
+
+2015-09-10 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/sip/qsciabstractapis.sip, Python/sip/qsciapis.sip:
+ Fixed the Python binding for
+ QsciAbstractAPIs::updateAutoCompletionList().
+ [53f2939a3b29] <2.9-maint>
+
+2015-09-08 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure.py:
+ Use win32-msvc2015 for Python v3.5 and later.
+ [2f264662e2c7] <2.9-maint>
+
+2015-09-01 Phil Thompson <phil at riverbankcomputing.com>
+
+ * qt/qsciscintilla.cpp:
+ Fixed the restyling of a document displayed in multiple editors.
+ [9309f264ab57] <2.9-maint>
+
+2015-08-24 Phil Thompson <phil at riverbankcomputing.com>
+
+ * qt/qscintilla.pro, qt/qsciscintilla.cpp:
+ Fixed a problem starting a call tip when the auto-completion list is
+ displayed. Bumped the library version.
+ [2ec2115ea4d2] <2.9-maint>
+
+2015-07-12 Phil Thompson <phil at riverbankcomputing.com>
+
+ * designer-Qt4Qt5/qscintillaplugin.h:
+ Fixed a warning message when compiling against Qt v5.5.0.
+ [3ff05a0ef88d] <2.9-maint>
+
+2015-07-09 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure.py:
+ Update QMAKE_RPATHDIR rather than set it.
+ [045c64a7e65c] <2.9-maint>
+
+2015-06-24 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure.py:
+ Set QMAKE_RPATHDIR for Qt v5.5 on OS X.
+ [b83394e4a676] <2.9-maint>
+
+2015-05-26 Phil Thompson <phil at riverbankcomputing.com>
+
+ * Python/configure.py:
+ Fixed the backstop handling in the Python bindings configuration
+ script and bumped the version number.
+ [1ab1dd7ea495] <2.9-maint>
+
+2015-05-02 Phil Thompson <phil at riverbankcomputing.com>
+
+ * qt/qscintilla.pro:
+ Use QT_HOST_DATA for the .prf destination with Qt v5. Removed all Qt
+ v3 support from the .pro file.
+ [63c0391624a8] <2.9-maint>
+
2015-04-20 Phil Thompson <phil at riverbankcomputing.com>
* .hgtags:
Added tag 2.9 for changeset 41ee8162fa81
- [9817b0a7a4f7] [tip]
+ [9817b0a7a4f7]
* NEWS:
Released as v2.9.
diff --git a/NEWS b/NEWS
index 5214231..5c6c2e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+v2.9.1 24th October 2015
+ - Added the .api file for Python v3.5.
+ - Bug fixes.
+
v2.9 20th April 2015
- Based on Scintilla v3.5.4.
- Added UserLiteral, InactiveUserLiteral, TaskMarker, InactiveTaskMarker,
diff --git a/Python/configure-old.py b/Python/configure-old.py
index c21fb6d..7cf4f6d 100644
--- a/Python/configure-old.py
+++ b/Python/configure-old.py
@@ -80,7 +80,7 @@ def create_optparser():
setattr(parser.values, option.dest, os.path.abspath(value))
p = optparse.OptionParser(usage="python %prog [options]",
- version="2.9")
+ version="2.9.1")
p.add_option("-a", "--apidir", action="callback", default=None,
type="string", metavar="DIR", dest="qscidir",
@@ -180,8 +180,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.9":
- sipconfig.error("QScintilla %s is being used but the Python bindings 2.9 are being built. Please use matching versions." % sciversstr)
+ if sciversstr != "2.9.1":
+ sipconfig.error("QScintilla %s is being used but the Python bindings 2.9.1 are being built. Please use matching versions." % sciversstr)
sipconfig.inform("QScintilla %s is being used." % sciversstr)
else:
diff --git a/Python/configure.py b/Python/configure.py
index ec1dbfb..d58d629 100644
--- a/Python/configure.py
+++ b/Python/configure.py
@@ -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 v1.3 of this boilerplate.
+# This is v1.4 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.9'
+ version = '2.9.1'
# 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
@@ -680,7 +680,9 @@ class _TargetConfiguration:
# The default qmake spec.
if self.py_platform == 'win32':
- if self.py_version >= 0x030300:
+ if self.py_version >= 0x030500:
+ self.qmake_spec = 'win32-msvc2015'
+ elif self.py_version >= 0x030300:
self.qmake_spec = 'win32-msvc2010'
elif self.py_version >= 0x020600:
self.qmake_spec = 'win32-msvc2008'
@@ -806,14 +808,10 @@ class _TargetConfiguration:
if qt_version > 0x060000:
qt_version = 0x060000
-
- backstop = 'Qt_6_0_0'
else:
if qt_version > 0x050000:
qt_version = 0x050000
- backstop = 'Qt_5_0_0'
-
major = (qt_version >> 16) & 0xff
minor = (qt_version >> 8) & 0xff
patch = qt_version & 0xff
@@ -821,9 +819,6 @@ class _TargetConfiguration:
flags.append('-t')
flags.append('Qt_%d_%d_%d' % (major, minor, patch))
- flags.append('-B')
- flags.append(backstop)
-
for feat in parser.getlist(section, 'pyqt_disabled_features', []):
flags.append('-x')
flags.append(feat)
@@ -1202,9 +1197,9 @@ def _inform_user(target_config, module_config):
def _generate_code(target_config, opts, module_config):
- """ Generate the code for the QScintilla module. target_config is the
- target configuration. opts are the command line options. module_config is
- the module configuration.
+ """ Generate the code for the module. target_config is the target
+ configuration. opts are the command line options. module_config is the
+ module configuration.
"""
inform(
@@ -1221,6 +1216,11 @@ def _generate_code(target_config, opts, module_config):
# Get the flags used for the main PyQt module.
argv.extend(target_config.pyqt_sip_flags.split())
+ # Add the backstop version.
+ argv.append('-B')
+ argv.append('Qt_6_0_0' if target_config.pyqt_package == 'PyQt5'
+ else 'Qt_5_0_0')
+
# Add PyQt's .sip files to the search path.
argv.append('-I')
argv.append(target_config.pyqt_sip_dir)
@@ -1434,6 +1434,9 @@ macx {
QMAKE_LFLAGS += "-undefined dynamic_lookup"
greaterThan(QT_MAJOR_VERSION, 4) {
QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
+ greaterThan(QT_MINOR_VERSION, 4) {
+ QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS]
+ }
}
''')
diff --git a/Python/sip/qsciabstractapis.sip b/Python/sip/qsciabstractapis.sip
index 0634081..90b49ed 100644
--- a/Python/sip/qsciabstractapis.sip
+++ b/Python/sip/qsciabstractapis.sip
@@ -31,7 +31,7 @@ public:
QsciLexer *lexer() const;
virtual void updateAutoCompletionList(const QStringList &context,
- QStringList &list) = 0;
+ QStringList &list /In, Out/) = 0;
virtual void autoCompletionSelected(const QString &selection);
virtual QStringList callTips(const QStringList &context, int commas,
diff --git a/Python/sip/qsciapis.sip b/Python/sip/qsciapis.sip
index bab2169..b8c9b1b 100644
--- a/Python/sip/qsciapis.sip
+++ b/Python/sip/qsciapis.sip
@@ -42,7 +42,7 @@ public:
QStringList installedAPIFiles() const;
virtual void updateAutoCompletionList(const QStringList &context,
- QStringList &list);
+ QStringList &list /In, Out/);
virtual void autoCompletionSelected(const QString &selection);
virtual QStringList callTips(const QStringList &context, int commas,
diff --git a/Qt4Qt5/Qsci/qsciglobal.h b/Qt4Qt5/Qsci/qsciglobal.h
index 84cc8d3..a94606f 100644
--- a/Qt4Qt5/Qsci/qsciglobal.h
+++ b/Qt4Qt5/Qsci/qsciglobal.h
@@ -28,8 +28,8 @@ extern "C++" {
#include <qglobal.h>
-#define QSCINTILLA_VERSION 0x020900
-#define QSCINTILLA_VERSION_STR "2.9"
+#define QSCINTILLA_VERSION 0x020901
+#define QSCINTILLA_VERSION_STR "2.9.1"
// Under Windows, define QSCINTILLA_MAKE_DLL to create a Scintilla DLL, or
diff --git a/Qt4Qt5/qscintilla.pro b/Qt4Qt5/qscintilla.pro
index 4394927..66fea9b 100644
--- a/Qt4Qt5/qscintilla.pro
+++ b/Qt4Qt5/qscintilla.pro
@@ -20,19 +20,17 @@
# This must be kept in sync with Python/configure.py, Python/configure-old.py,
# example-Qt4Qt5/application.pro and designer-Qt4Qt5/designer.pro.
-!win32:VERSION = 12.0.0
+!win32:VERSION = 12.0.1
TEMPLATE = lib
TARGET = qscintilla2
CONFIG += qt warn_off release thread exceptions
INCLUDEPATH += . ../include ../lexlib ../src
-DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
-greaterThan(QT_MAJOR_VERSION, 3) {
- CONFIG(staticlib) {
- DEFINES -= QSCINTILLA_MAKE_DLL
- }
+!CONFIG(staticlib) {
+ DEFINES += QSCINTILLA_MAKE_DLL
}
+DEFINES += SCINTILLA_QT SCI_LEXER
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets printsupport
@@ -49,38 +47,28 @@ greaterThan(QT_MAJOR_VERSION, 4) {
# Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE
-# Handle both Qt v4 and v3.
target.path = $$[QT_INSTALL_LIBS]
-isEmpty(target.path) {
- target.path = $(QTDIR)/lib
-}
+INSTALLS += target
header.path = $$[QT_INSTALL_HEADERS]
header.files = Qsci
-isEmpty(header.path) {
- header.path = $(QTDIR)/include/Qsci
- header.files = Qsci/qsci*.h
-}
+INSTALLS += header
trans.path = $$[QT_INSTALL_TRANSLATIONS]
trans.files = qscintilla_*.qm
-isEmpty(trans.path) {
- trans.path = $(QTDIR)/translations
-}
+INSTALLS += trans
qsci.path = $$[QT_INSTALL_DATA]
qsci.files = ../qsci
-isEmpty(qsci.path) {
- qsci.path = $(QTDIR)
-}
-
-INSTALLS += header trans qsci target
+INSTALLS += qsci
-greaterThan(QT_MAJOR_VERSION, 3) {
+greaterThan(QT_MAJOR_VERSION, 4) {
+ features.path = $$[QT_HOST_DATA]/mkspecs/features
+} else {
features.path = $$[QT_INSTALL_DATA]/mkspecs/features
- features.files = $$PWD/features/qscintilla2.prf
- INSTALLS += features
}
+features.files = $$PWD/features/qscintilla2.prf
+INSTALLS += features
HEADERS = \
./Qsci/qsciglobal.h \
diff --git a/Qt4Qt5/qsciscintilla.cpp b/Qt4Qt5/qsciscintilla.cpp
index 92ebb0c..b9ffa6e 100644
--- a/Qt4Qt5/qsciscintilla.cpp
+++ b/Qt4Qt5/qsciscintilla.cpp
@@ -245,13 +245,10 @@ void QsciScintilla::handleCharAdded(int ch)
// start character. If it is then create a new list which will be a subset
// of the current one. The case where it isn't a start character seems to
// be handled correctly elsewhere.
- if (isListActive())
+ if (isListActive() && isStartChar(ch))
{
- if (isStartChar(ch))
- {
- cancelList();
- startAutoCompletion(acSource, false, use_single == AcusAlways);
- }
+ cancelList();
+ startAutoCompletion(acSource, false, use_single == AcusAlways);
return;
}
@@ -3233,7 +3230,6 @@ void QsciScintilla::detachLexer()
SendScintilla(SCI_STYLERESETDEFAULT);
SendScintilla(SCI_STYLECLEARALL);
- SendScintilla(SCI_CLEARDOCUMENTSTYLE);
}
}
@@ -3249,6 +3245,8 @@ void QsciScintilla::setLexer(QsciLexer *lexer)
if (lex)
{
+ SendScintilla(SCI_CLEARDOCUMENTSTYLE);
+
if (lex->lexer())
SendScintilla(SCI_SETLEXERLANGUAGE, lex->lexer());
else
@@ -4231,7 +4229,7 @@ bool QsciScintilla::event(QEvent *e)
}
// We want any key that is bound.
- QsciCommand *cmd = stdCmds->boundTo(ke->key() | ke->modifiers());
+ QsciCommand *cmd = stdCmds->boundTo(ke->key() | (ke->modifiers() & ~Qt::KeypadModifier));
if (cmd)
{
diff --git a/designer-Qt4Qt5/qscintillaplugin.h b/designer-Qt4Qt5/qscintillaplugin.h
index cd66477..12f0377 100644
--- a/designer-Qt4Qt5/qscintillaplugin.h
+++ b/designer-Qt4Qt5/qscintillaplugin.h
@@ -4,7 +4,7 @@
#ifndef _QSCINTILLAPLUGIN_H
#define _QSCINTILLAPLUGIN_H
-#include <QDesignerCustomWidgetInterface>
+#include <QtDesigner>
class QScintillaPlugin : public QObject, public QDesignerCustomWidgetInterface
diff --git a/doc/html-Qt4Qt5/annotated.html b/doc/html-Qt4Qt5/annotated.html
index 6784da9..1af7912 100644
--- a/doc/html-Qt4Qt5/annotated.html
+++ b/doc/html-Qt4Qt5/annotated.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -102,7 +102,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:25 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:39 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciAPIs-members.html b/doc/html-Qt4Qt5/classQsciAPIs-members.html
index c985df8..d54c1ff 100644
--- a/doc/html-Qt4Qt5/classQsciAPIs-members.html
+++ b/doc/html-Qt4Qt5/classQsciAPIs-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -75,7 +75,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciAPIs.html b/doc/html-Qt4Qt5/classQsciAPIs.html
index eb8209b..ce85689 100644
--- a/doc/html-Qt4Qt5/classQsciAPIs.html
+++ b/doc/html-Qt4Qt5/classQsciAPIs.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -407,7 +407,7 @@ virtual </td><td class="memItemRight" valign="bottom"><a class="el" href="c
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html b/doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html
index e0490d1..0be5a4f 100644
--- a/doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html
+++ b/doc/html-Qt4Qt5/classQsciAbstractAPIs-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -58,7 +58,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciAbstractAPIs.html b/doc/html-Qt4Qt5/classQsciAbstractAPIs.html
index dcf894b..1b14512 100644
--- a/doc/html-Qt4Qt5/classQsciAbstractAPIs.html
+++ b/doc/html-Qt4Qt5/classQsciAbstractAPIs.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -212,7 +212,7 @@ virtual </td><td class="memItemRight" valign="bottom"><a class="el" href="c
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciCommand-members.html b/doc/html-Qt4Qt5/classQsciCommand-members.html
index 1fa35ab..b6dfd81 100644
--- a/doc/html-Qt4Qt5/classQsciCommand-members.html
+++ b/doc/html-Qt4Qt5/classQsciCommand-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -159,7 +159,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciCommand.html b/doc/html-Qt4Qt5/classQsciCommand.html
index 70a3235..24c1130 100644
--- a/doc/html-Qt4Qt5/classQsciCommand.html
+++ b/doc/html-Qt4Qt5/classQsciCommand.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -621,7 +621,7 @@ static bool </td><td class="memItemRight" valign="bottom"><a class="el" hre
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciCommandSet-members.html b/doc/html-Qt4Qt5/classQsciCommandSet-members.html
index a0aa252..5b60832 100644
--- a/doc/html-Qt4Qt5/classQsciCommandSet-members.html
+++ b/doc/html-Qt4Qt5/classQsciCommandSet-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -59,7 +59,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciCommandSet.html b/doc/html-Qt4Qt5/classQsciCommandSet.html
index 05d5813..ac97450 100644
--- a/doc/html-Qt4Qt5/classQsciCommandSet.html
+++ b/doc/html-Qt4Qt5/classQsciCommandSet.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -137,7 +137,7 @@ void </td><td class="memItemRight" valign="bottom"><a class="el" href="clas
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciDocument-members.html b/doc/html-Qt4Qt5/classQsciDocument-members.html
index df2ad33..369f6a8 100644
--- a/doc/html-Qt4Qt5/classQsciDocument-members.html
+++ b/doc/html-Qt4Qt5/classQsciDocument-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -56,7 +56,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciDocument.html b/doc/html-Qt4Qt5/classQsciDocument.html
index 8fd1f34..a870a7c 100644
--- a/doc/html-Qt4Qt5/classQsciDocument.html
+++ b/doc/html-Qt4Qt5/classQsciDocument.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -70,7 +70,7 @@ Public Member Functions</h2></td></tr>
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:24 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciLexer-members.html b/doc/html-Qt4Qt5/classQsciLexer-members.html
index be5d562..661000c 100644
--- a/doc/html-Qt4Qt5/classQsciLexer-members.html
+++ b/doc/html-Qt4Qt5/classQsciLexer-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -105,7 +105,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:25 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciLexer.html b/doc/html-Qt4Qt5/classQsciLexer.html
index e0b39a5..32c278e 100644
--- a/doc/html-Qt4Qt5/classQsciLexer.html
+++ b/doc/html-Qt4Qt5/classQsciLexer.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -1213,7 +1213,7 @@ Protected Member Functions</h2></td></tr>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:25 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciLexerAVS-members.html b/doc/html-Qt4Qt5/classQsciLexerAVS-members.html
index db41976..c372fb8 100644
--- a/doc/html-Qt4Qt5/classQsciLexerAVS-members.html
+++ b/doc/html-Qt4Qt5/classQsciLexerAVS-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -126,7 +126,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:25 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciLexerAVS.html b/doc/html-Qt4Qt5/classQsciLexerAVS.html
index 6d38bb8..ca8cb46 100644
--- a/doc/html-Qt4Qt5/classQsciLexerAVS.html
+++ b/doc/html-Qt4Qt5/classQsciLexerAVS.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -612,7 +612,7 @@ Additional Inherited Members</h2></td></tr>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:25 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciLexerBash-members.html b/doc/html-Qt4Qt5/classQsciLexerBash-members.html
index 5612b38..a1815ce 100644
--- a/doc/html-Qt4Qt5/classQsciLexerBash-members.html
+++ b/doc/html-Qt4Qt5/classQsciLexerBash-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -125,7 +125,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:25 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciLexerBash.html b/doc/html-Qt4Qt5/classQsciLexerBash.html
index 7badede..3b8c36b 100644
--- a/doc/html-Qt4Qt5/classQsciLexerBash.html
+++ b/doc/html-Qt4Qt5/classQsciLexerBash.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -636,7 +636,7 @@ Additional Inherited Members</h2></td></tr>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:25 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciLexerBatch-members.html b/doc/html-Qt4Qt5/classQsciLexerBatch-members.html
index d3e60c7..b669e9c 100644
--- a/doc/html-Qt4Qt5/classQsciLexerBatch-members.html
+++ b/doc/html-Qt4Qt5/classQsciLexerBatch-members.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">QScintilla
- <span id="projectnumber">2.9</span>
+ <span id="projectnumber">2.9.1</span>
</div>
</td>
</tr>
@@ -115,7 +115,7 @@
</table></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Mon Apr 20 2015 15:38:25 for QScintilla by <a href="http://www.doxygen.org/index.html">
+Generated on Sat Oct 24 2015 14:00:38 for QScintilla by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.8
</small></address>
diff --git a/doc/html-Qt4Qt5/classQsciLexerBatch.html b/doc/html-Qt4Qt5/classQsciLexerBatch.html
index 34d52c0..9162eba 100644
--- a/doc/html-Qt4Qt5/classQsciLexerBatch.html
+++ b/doc/html-Qt4Qt5/classQsciLexerBatch.html
... 13377 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/qscintilla2.git
More information about the Python-modules-commits
mailing list