diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:05:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:05:15 +0100 |
| commit | 4ef60892ce9e8dea75a31b0be7895ebf473346a9 (patch) | |
| tree | 7778fdfb3460d24db63a5f15b28b138507eb1af0 /src/svg | |
| parent | b50d20b7057fcd808525921e56d25f75140c79cd (diff) | |
| parent | a9ac71a443260de66f720f0184646847b03fcb46 (diff) | |
| download | qtsvg-4ef60892ce9e8dea75a31b0be7895ebf473346a9.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ia508d1e3f74dd35ac28b104c0cbdacdb6fe16d6b
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/doc/qtsvg.qdocconf | 2 | ||||
| -rw-r--r-- | src/svg/qsvghandler.cpp | 1 | ||||
| -rw-r--r-- | src/svg/svg.pro | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf index 181c6a7..e8460e9 100644 --- a/src/svg/doc/qtsvg.qdocconf +++ b/src/svg/doc/qtsvg.qdocconf @@ -39,7 +39,7 @@ sourcedirs += .. \ exampledirs += ../../../examples/svg \ snippets/ -examplesinstallpath = svg +examplesinstallpath = qtsvg/svg imagedirs += images diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index ac9425d..4e78b98 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -414,6 +414,7 @@ static const char * QSvgStyleSelector_nodeString[] = { "rect", "text", "textarea", + "tspan", "use", "video" }; diff --git a/src/svg/svg.pro b/src/svg/svg.pro index f2906ce..83e76b7 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -46,10 +46,10 @@ wince*: { contains(QT_CONFIG, system-zlib) { if(unix|mingw): LIBS_PRIVATE += -lz - else: LIBS += zdll.lib + else { + isEmpty(ZLIB_LIBS): LIBS += zdll.lib + else: LIBS += $$ZLIB_LIBS + } } else { - git_build: \ - INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib - else: \ - INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib + QT_PRIVATE += zlib-private } |