aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2016-12-30 20:56:35 -0800
committerGitHub <noreply@github.com>2016-12-30 20:56:35 -0800
commit55a05684f53aa94da62126fd2951bf29406c5282 (patch)
tree9298b75e12e881ead0463f0da389bda0649e1b7a
parent31daeeb7f585d0b64de78e31b4e0de8be8b5d213 (diff)
parent614320e0074ed764f4ffba365e18bf0e32cbce85 (diff)
downloadvcpkg-55a05684f53aa94da62126fd2951bf29406c5282.tar.gz
vcpkg-55a05684f53aa94da62126fd2951bf29406c5282.zip
Merge pull request #474 from traversaro/patch-2
[qt5] Turn -no-pcre in -qt-pcre
-rw-r--r--ports/qt5/CONTROL4
-rw-r--r--ports/qt5/portfile.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index 0b34843f1..40bde5f2a 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,4 +1,4 @@
Source: qt5
-Version: 5.7.1-1
+Version: 5.7.1-2
Description: Qt5 application framework main components. Webengine, examples and tests not included.
-Build-Depends: sqlite3, libpq \ No newline at end of file
+Build-Depends: sqlite3, libpq
diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake
index 41c103870..adcec1c8b 100644
--- a/ports/qt5/portfile.cmake
+++ b/ports/qt5/portfile.cmake
@@ -49,7 +49,7 @@ vcpkg_execute_required_process(
-qt-libjpeg
-no-libpng
-no-freetype
- -no-pcre
+ -qt-pcre
-no-harfbuzz
-system-sqlite
-nomake examples -nomake tests -skip webengine