diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-28 01:08:17 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-28 01:35:31 -0700 |
| commit | 50af29ade61d70faaedb912258295d153f585a75 (patch) | |
| tree | 1e9efaf76b119990681428b5843a5c5a5e5a2199 | |
| parent | 5a32a97de1086b82d3f93a082a4e5c57e4b395e4 (diff) | |
| download | vcpkg-50af29ade61d70faaedb912258295d153f585a75.tar.gz vcpkg-50af29ade61d70faaedb912258295d153f585a75.zip | |
[qt5] Restore trailing spaces to uncorrupt patches.
| -rw-r--r-- | ports/qt5/fix-commandline-overrides.patch | 10 | ||||
| -rw-r--r-- | ports/qt5/fix-qalgorithms-vs2017.patch | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ports/qt5/fix-commandline-overrides.patch b/ports/qt5/fix-commandline-overrides.patch index 28679c190..08f627740 100644 --- a/ports/qt5/fix-commandline-overrides.patch +++ b/ports/qt5/fix-commandline-overrides.patch @@ -18,7 +18,7 @@ index eaaa161..fdec8ea 100644 +++ b/qtbase/mkspecs/features/qt_configure.prf @@ -401,6 +401,7 @@ defineReplace(qtConfPrepareArgs) { } - + defineTest(qtConfSetupLibraries) { + asspfx = $${currentConfig}.commandline.assignments for (l, $${currentConfig}.libraries._KEYS_) { @@ -69,7 +69,7 @@ index eaaa161..fdec8ea 100644 + } + export($${asspfx}._KEYS_) + - + # reverse mapping for assignments on command line. - for (a, $${currentConfig}.commandline.assignments._KEYS_) { - apfx = $${currentConfig}.commandline.assignments.$${a} @@ -81,7 +81,7 @@ index eaaa161..fdec8ea 100644 @@ -479,6 +514,18 @@ defineTest(qtConfLibrary_inline) { export($${1}.libs) } - + + incdir = $$val_escape(config.input.$${input}.incdir) + !isEmpty(incdir) { + $${1}.includedir = $$incdir @@ -96,7 +96,7 @@ index eaaa161..fdec8ea 100644 + return(true) } - + diff --git a/qtbase/src/gui/configure.json b/qtbase/src/gui/configure.json index 1f50116..af03362 100644 --- a/qtbase/src/gui/configure.json @@ -115,7 +115,7 @@ index 1e08aa7..314970e 100644 --- a/qtbase/src/network/configure.json +++ b/qtbase/src/network/configure.json @@ -7,9 +7,6 @@ - + "commandline": { "assignments": { - "OPENSSL_LIBS": "openssl.libs", diff --git a/ports/qt5/fix-qalgorithms-vs2017.patch b/ports/qt5/fix-qalgorithms-vs2017.patch index 49b558ae3..eab41c0c3 100644 --- a/ports/qt5/fix-qalgorithms-vs2017.patch +++ b/ports/qt5/fix-qalgorithms-vs2017.patch @@ -80,13 +80,13 @@ index 303374b..7e84695 100644 @@ -660,9 +661,13 @@ Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) Q_DECL_NO #endif // MSVC #endif // QT_HAS_CONSTEXPR_BUILTINS - + +#ifndef QT_POPCOUNT_CONSTEXPR +#define QT_POPCOUNT_CONSTEXPR Q_DECL_CONSTEXPR +#endif + } //namespace QAlgorithmsPrivate - + -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint32 v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint32 v) Q_DECL_NOTHROW { @@ -95,7 +95,7 @@ index 303374b..7e84695 100644 @@ -675,7 +680,7 @@ Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint32 v) Q #endif } - + -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint8 v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint8 v) Q_DECL_NOTHROW { @@ -104,7 +104,7 @@ index 303374b..7e84695 100644 @@ -685,7 +690,7 @@ Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint8 v) Q_ #endif } - + -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint16 v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint16 v) Q_DECL_NOTHROW { @@ -113,7 +113,7 @@ index 303374b..7e84695 100644 @@ -696,7 +701,7 @@ Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint16 v) Q #endif } - + -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint64 v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint64 v) Q_DECL_NOTHROW { @@ -122,7 +122,7 @@ index 303374b..7e84695 100644 @@ -711,7 +716,7 @@ Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(quint64 v) Q #endif } - + -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qPopulationCount(long unsigned int v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(long unsigned int v) Q_DECL_NOTHROW { @@ -133,6 +133,6 @@ index 303374b..7e84695 100644 #undef QALGORITHMS_USE_BUILTIN_POPCOUNT #endif +#undef QT_POPCOUNT_CONSTEXPR - + Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint32 v) Q_DECL_NOTHROW { |