Merge branch 'release/v0.11.0'

Author: cloose

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/cloose/discount.git
 [submodule "3rdparty/hunspell"]
 	path = 3rdparty/hunspell
-	url = https://github.com/zdenop/hunspell-mingw.git
+	url = https://github.com/cloose/hunspell-mingw.git
 [submodule "3rdparty/hoedown"]
 	path = 3rdparty/hoedown
 	url = https://github.com/cloose/hoedown.git

.travis.yml

@@ -5,6 +5,8 @@ compiler:
 before_install:
   - sudo add-apt-repository -y ppa:beineri/opt-qt521 # for Qt 5.2
   - sudo apt-get update -qq
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
 install:
   - sudo apt-get install -qq qt52base qt52declarative qt52webkit qt52tools libhunspell-dev
   - sudo apt-get install -qq libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev

3rdparty/3rdparty.pro

@@ -1,11 +1,16 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    discount \
-    hunspell
+    peg-markdown-highlight
 
-with_hoedown {
-    message("3rdparty: Build hoedown markdown converter library")
-    DEFINES += ENABLE_HOEDOWN
-    SUBDIRS += hoedown
+win32 {
+    SUBDIRS += \
+        discount \
+        hunspell
+
+    with_hoedown {
+        message("3rdparty: Build hoedown markdown converter library")
+        DEFINES += ENABLE_HOEDOWN
+        SUBDIRS += hoedown
+    }
 }

3rdparty/discount

@@ -4,14 +4,9 @@
 #
 #-------------------------------------------------
 
-QT       -= core gui
+QT -= core gui
 
-win32-msvc* {
-TARGET = libpmh
-} else {
 TARGET = pmh
-}
-
 TEMPLATE = lib
 CONFIG += staticlib
 
@@ -24,11 +19,3 @@ HEADERS += \
     pmh_parser.h \
     pmh_definitions.h
 
-#unix:!symbian {
-#    maemo5 {
-#        target.path = /opt/usr/lib
-#    } else {
-#        target.path = /usr/lib
-#    }
-#    INSTALLS += target
-#}