Merge branch 'upstream'

Conflicts:
addon/doxyparse/README
addon/doxyparse/doxyparse.cpp

.gitignore

@@ -13,3 +13,4 @@
 
 /doxygen_docs
 /doxygen.tag
+/build*

.travis.yml

@@ -1,18 +1,56 @@
 language: cpp
+os:
+    - linux-ppc64le
+    - linux
+dist: xenial
 compiler:
   - gcc
   - clang
+sudo: required
 
-before_install:
-    - sudo apt-add-repository ppa:smspillaz/cmake-2.8.12 -y
-    - sudo apt-get update -qq
+addons:
+    apt:
+        update: true
+        packages:
+            - texlive
+            - texlive-generic-recommended
+            - texlive-extra-utils
+            - texlive-latex-extra
+            - texlive-font-utils
+            - ghostscript
+            - libxml2-utils
+            - cmake
+            - cmake-data
 
-install:
-    - sudo apt-get install -qq texlive
-    - sudo apt-get install -qq texlive-extra-utils
-    - sudo apt-get install -q -y texlive-latex-extra
-    - sudo apt-get install -qq libxml2-utils
-    - sudo apt-get install -qq cmake cmake-data
+jobs:
+    include:
+        - os: osx
+          compiler: clang
+
+before_script:
+    - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
+        sudo mkdir -p /usr/local/man;
+        sudo chown -R "${USER}:admin" /usr/local/man;
+        pip install --quiet conan;
+        export HOMEBREW_NO_AUTO_UPDATE=1;
+        brew install ghostscript;
+
+        travis_wait brew cask install mactex-no-gui;
+        curl -O -L http://mirrors.ctan.org/support/epstopdf.zip;
+        unzip epstopdf.zip;
+        mkdir -p /Users/travis/Library/TeX/texbin/;
+        mv epstopdf/epstopdf.pl /Users/travis/Library/TeX/texbin/epstopdf;
+        chmod a+x /Users/travis/Library/TeX/texbin/epstopdf;
+        rm -rf epstopdf*;
+        export PATH=/Users/travis/Library/TeX/texbin:/Library/TeX/texbin:$PATH;
+
+        conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan;
+        printf "[requires]\n
+        libxml2/2.9.8@bincrafters/stable\n
+        qt/5.11.3@bincrafters/stable" >> conanfile.txt;
+        conan install . -g virtualrunenv;
+        source activate_run.sh;
+      fi;
 
 script:
     - mkdir build

CMakeLists.txt

@@ -36,7 +36,7 @@ if (use_sqlite3)
 	set(sqlite3  "1" CACHE INTERNAL "used in settings.h")
 endif()
 
-set(MACOS_VERSION_MIN 10.5)
+set(MACOS_VERSION_MIN 10.9)
 if (use_libclang)
 	set(clang    "1" CACHE INTERNAL "used in settings.h")
         find_package(LLVM CONFIG REQUIRED)
@@ -86,7 +86,10 @@ find_package(BISON REQUIRED)
 find_package(Threads)
 
 if (sqlite3)
-    find_package(SQLite3 REQUIRED)
+  find_package(SQLite3 REQUIRED)
+  if (SQLITE3_VERSION VERSION_LESS 3.9.0)
+    message(SEND_ERROR "Doxygen requires at least sqlite3 version 3.9.0 (installed: ${SQLITE3_VERSION})")
+  endif()
 endif()
 
 find_package(Iconv REQUIRED)

README.md

@@ -1,25 +1,25 @@
 Doxygen
 ===============
-Doxygen is the de facto standard tool for generating documentation from 
-annotated C++ sources, but it also supports other popular programming 
-languages such as C, Objective-C, C#, PHP, Java, Python, IDL 
-(Corba, Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL, Tcl, 
+Doxygen is the de facto standard tool for generating documentation from
+annotated C++ sources, but it also supports other popular programming
+languages such as C, Objective-C, C#, PHP, Java, Python, IDL
+(Corba, Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL, Tcl,
 and to some extent D.
 
 Doxygen can help you in three ways:
 
-1. It can generate an on-line documentation browser (in HTML) and/or an 
-   off-line reference manual (in LaTeX) from a set of documented source files. 
-   There is also support for generating output in RTF (MS-Word), PostScript, 
-   hyperlinked PDF, compressed HTML, DocBook and Unix man pages. 
-   The documentation is extracted directly from the sources, which makes 
+1. It can generate an on-line documentation browser (in HTML) and/or an
+   off-line reference manual (in LaTeX) from a set of documented source files.
+   There is also support for generating output in RTF (MS-Word), PostScript,
+   hyperlinked PDF, compressed HTML, DocBook and Unix man pages.
+   The documentation is extracted directly from the sources, which makes
    it much easier to keep the documentation consistent with the source code.
-2. You can configure doxygen to extract the code structure from undocumented 
-   source files. This is very useful to quickly find your way in large 
-   source distributions. Doxygen can also visualize the relations between 
-   the various elements by means of include dependency graphs, inheritance 
+2. You can configure doxygen to extract the code structure from undocumented
+   source files. This is very useful to quickly find your way in large
+   source distributions. Doxygen can also visualize the relations between
+   the various elements by means of include dependency graphs, inheritance
    diagrams, and collaboration diagrams, which are all generated automatically.
-3. You can also use doxygen for creating normal documentation (as I did for 
+3. You can also use doxygen for creating normal documentation (as I did for
    the doxygen user manual and doxygen web-site).
 
 Download
@@ -29,25 +29,20 @@ The latest binaries and source of Doxygen can be downloaded from:
 
 Developers
 ---------
-* Build Status: <a href="https://travis-ci.org/doxygen/doxygen"><img src="https://secure.travis-ci.org/doxygen/doxygen.png?branch=master"/></a>
+* Linux & macOS Build Status: <a href="https://travis-ci.org/doxygen/doxygen"><img src="https://secure.travis-ci.org/doxygen/doxygen.png?branch=master"/></a>
+* Windows Build Status: <a href="https://ci.appveyor.com/project/doxygen/doxygen"><img src="https://ci.appveyor.com/api/projects/status/github/doxygen/doxygen"/></a>
 
 * Coverity Scan Build Status: <a href="https://scan.coverity.com/projects/2860"> <img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/2860/badge.svg"/> </a>
 
 * Doxygen's Doxygen Documentation: <a href="https://codedocs.xyz/doxygen/doxygen/"><img src="https://codedocs.xyz/doxygen/doxygen.svg"/></a>
 
-* Install
-  * Quick install see (./INSTALL) 
-  * else http://www.doxygen.org/manual/install.html
+* Install: Please read the installation section of the manual (http://www.doxygen.org/manual/install.html)
 
 * Project stats: https://www.openhub.net/p/doxygen
 
 Issues, bugs, requests, ideas
 ----------------------------------
-Use the bug tracker to report bugs:
-* current list:
-    * [Bugzilla](https://bugzilla.gnome.org/buglist.cgi?product=doxygen&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED)
-* Submit a new bug or feature request 
-    * [Enter bug](https://bugzilla.gnome.org/enter_bug.cgi?product=doxygen)
+Use the [issue](https://github.com/doxygen/doxygen/issues) tracker to report bugs.
 
 Comms
 ----------------------------------
@@ -63,10 +58,10 @@ There are three mailing lists:
 
 Source Code
 ----------------------------------
-In May 2013, Doxygen moved from 
+In May 2013, Doxygen moved from
 subversion to git hosted at GitHub
 * https://github.com/doxygen/doxygen
 
 Enjoy,
 
-Dimitri van Heesch (dimitri at stack.nl)
+Dimitri van Heesch (doxygen at gmail.com)

VERSION

@@ -1 +1 @@
-1.8.14
+1.8.15

addon/doxmlparser/src/dochandler.h

@@ -571,7 +571,7 @@ class EMailHandler : public DocEMailImpl, public BaseHandler<EMailHandler>
 
 //-----------------------------------------------------------------------------
 
-/* \brief Node representing a link to an URL
+/* \brief Node representing a link to a URL
  *
  */
 class ULinkHandler : public DocULinkImpl, public BaseHandler<ULinkHandler>

addon/doxyparse/README

@@ -32,7 +32,6 @@ More info and source code repository: https://github.com/analizo/doxygen
 * check if a alien-doxyparse release is necessary and do it on cpan
 
 AUTHORS
-=======
 
 Antonio Terceiro <[email protected]>
 João M. Miranda <[email protected]>

addon/doxyparse/doxyparse.cpp

@@ -197,7 +197,7 @@ std::string functionSignature(MemberDef* md) {
       Argument * argument = iterator.toFirst();
       if(argument != NULL) {
         signature += argumentData(argument);
-        for(++iterator; (argument = iterator.current()); ++iterator){
+        for(++iterator; (argument = iterator.current()); ++iterator) {
           signature += std::string(",") + argumentData(argument);
         }
       }