Merge 5fc8553 into b3ab956

opencor · Oct 3, 2018 · 69523e6 · 69523e6
2 parents b3ab956 + 5fc8553
commit 69523e6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 17 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,10 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
-                       { "change": "<strong>General:</strong> improved HiDPI support on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/1776\">#1776</a>)." },
-                       { "change": "<strong>Editor widget:</strong> properly highlight/replace text that was found using a regular expression (see issue <a href=\"https://github.com/opencor/opencor/issues/1816\">#1816</a>)." },
-                       { "change": "<strong>Simulation Experiment view:</strong> the resetting of model parameters is now more specific (see issue <a href=\"https://github.com/opencor/opencor/issues/1815\">#1815</a>). Fixed a small problem with graph panels not always autoscaling properly (see issue <a href=\"https://github.com/opencor/opencor/issues/1824\">#1824</a>)." },
-                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 7.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/1814\">#1814</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 3.2.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/1829\">#1829</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.10.8 (see issue <a href=\"https://github.com/opencor/opencor/issues/1833\">#1833</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 4, "patch": 1, "day": 20, "month": 5, "year": 2015, "type": 0,

diff --git a/doc/downloads/previousSnapshots.js b/doc/downloads/previousSnapshots.js
@@ -1,4 +1,29 @@
 var jsonData = { "versions": [
+                   { "major": 0, "minor": 0, "patch": 0, "day": 3, "month": 10, "year": 2018, "type": 2,
+                     "platforms": [
+                       { "name": "Windows", "supported": "Windows 7 and later",
+                         "files": [
+                           { "extension": ".exe" }, { "extension": ".zip" }
+                         ]
+                       },
+                       { "name": "Linux", "supported": "Ubuntu 16.04 LTS (Xenial Xerus) and later",
+                         "files": [
+                           { "extension": ".tar.gz" }
+                         ]
+                       },
+                       { "name": "macOS", "supported": "OS X 10.10 (Yosemite) and later",
+                         "files": [
+                           { "extension": ".dmg" }, { "extension": ".zip" }
+                         ]
+                       }
+                     ],
+                     "changes": [
+                       { "change": "<strong>General:</strong> improved HiDPI support on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/1776\">#1776</a>)." },
+                       { "change": "<strong>Editor widget:</strong> properly highlight/replace text that was found using a regular expression (see issue <a href=\"https://github.com/opencor/opencor/issues/1816\">#1816</a>)." },
+                       { "change": "<strong>Simulation Experiment view:</strong> the resetting of model parameters is now more specific (see issue <a href=\"https://github.com/opencor/opencor/issues/1815\">#1815</a>). Fixed a small problem with graph panels not always autoscaling properly (see issue <a href=\"https://github.com/opencor/opencor/issues/1824\">#1824</a>)." },
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 7.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/1814\">#1814</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 3.2.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/1829\">#1829</a>)." }
+                     ]
+                   },
                    { "major": 0, "minor": 0, "patch": 0, "day": 18, "month": 9, "year": 2018, "type": 2,
                      "platforms": [
                        { "name": "Windows", "supported": "Windows 7 and later",

diff --git a/src/plugins/thirdParty/QScintilla/CMakeLists.txt b/src/plugins/thirdParty/QScintilla/CMakeLists.txt
@@ -3,16 +3,16 @@ project(QScintillaPlugin)
 # Name and version of our package
 
 set(PACKAGE_NAME QScintilla)
-set(PACKAGE_VERSION 2.10.7)
+set(PACKAGE_VERSION 2.10.8)
 
 # Version of our library
 
 set(MAJOR_LIBRARY_VERSION 13)
-set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.2.0)
+set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.2.1)
 
 # Git tag for our library
 
-set(GIT_TAG v2.10.7)
+set(GIT_TAG v2.10.8)
 
 # Specify where our local package will be installed
 
@@ -65,27 +65,27 @@ if(USE_PREBUILT_QSCINTILLA_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} d0a2a809ad40063fdf826ffea87d7e15d0525b72
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 7a383d7683294a31f6ead1fb78e0693619de3cdc
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 967db9c1b86442a357991d5eeb6962e3b6a14134
-                                              a18db0e2c7f705b19689a2449f3e7e61c16765af)
+                                  SHA1_VALUES 91b3e2ade78d278c0fa221efa7f9f731a5798d37
+                                              fea522955340103f3be286fb15731d7a31a56be3)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 7519d6be9d329599a56a0591eaf96f3ed0abeb05
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 3aa0c93a32ccfdeb586b0b8b89a40ad35729027d
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 174ed664ac140b41a20dfe9c2fe068e92955074a
-                                              18723d2d4d4b5268ece50f1f3f77a4757131ea79)
+                                  SHA1_VALUES 18a2bcc82f9c43e627779a32d47afe3d728dd907
+                                              ed4d60b90647047d8435d62c0246d8379323ba81)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 9b0d5a4d0a3ebdd2722787d577e968b6a34c5467
+                              ${RELATIVE_PROJECT_SOURCE_DIR} acf46e5afd23683590e59685efc1d2086aa74f95
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 99f1e1a59d8c8862bf8b8a4d0b7378d1893b3979)
+                              SHA1_VALUES d259832c6388c9c446e9fe25ae5dfb71bf25c4e4)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 074b980702308d69d7ca59fb64a8332794d209eb
+                              ${RELATIVE_PROJECT_SOURCE_DIR} dcb6a5f68f0d3a030af77cc013e9230d5c1d7836
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 6c7f8146e9ecab3862af9df186b0ec5c04c87d66)
+                              SHA1_VALUES 80f6eb17c68595d5ab5b3b99c38fa3be4bf441f8)
     endif()
 else()
     # Set platform specific configuration options