diff options
| author | Joshua Duong <joshuaduong@google.com> | 2019-02-15 23:11:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-15 23:11:38 +0000 |
| commit | 3311fe90c7d27e7f8d7058e3e5752bd88dd87657 (patch) | |
| tree | 33d5a2c7b152dad36cc2ca8f5317dab80eb95249 | |
| parent | bf093a96e1a8f6cdc7cbe410174806fdc57182a0 (diff) | |
| parent | a742c9db6d9923c04d7035bafb54888e87c33cbf (diff) | |
| download | qt-emu-29.0-release.tar.gz | |
Merge changes I41b365cc,Ife1ee6b2,I5a004311 into emu-master-devemu-29.0-release
* changes:
PATCH (Qt 5.12.1): Don't build GN with static libc++.
PATCH (Qt 5.12.1): Filter dlls for plugin loading.
Revert "PATCH (Qt 5.12.1): Filter dlls for plugin loading."
| -rw-r--r-- | 5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp | 4 | ||||
| -rwxr-xr-x | 5.12.1/qtwebengine/src/3rdparty/gn/build/gen.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp b/5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp index 016879cca8..9bc1908193 100644 --- a/5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp +++ b/5.12.1/qtbase/src/corelib/plugin/qfactoryloader.cpp @@ -204,9 +204,9 @@ void QFactoryLoader::update() QStringList plugins = QDir(path).entryList( #if defined(Q_OS_WIN) QStringList(QStringLiteral("*.dll")), -#if defined(Q_OS_MAC) +#elif defined(Q_OS_MAC) QStringList(QStringLiteral("*.dylib*")), -#if defined(Q_OS_LIN) +#elif defined(Q_OS_LIN) QStringList(QStringLiteral("*.so*")), #else QStringList(QStringLiteral("*")), diff --git a/5.12.1/qtwebengine/src/3rdparty/gn/build/gen.py b/5.12.1/qtwebengine/src/3rdparty/gn/build/gen.py index 87db4c26bc..3e28ff08f6 100755 --- a/5.12.1/qtwebengine/src/3rdparty/gn/build/gen.py +++ b/5.12.1/qtwebengine/src/3rdparty/gn/build/gen.py @@ -373,7 +373,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): cflags.append('--sysroot=' + linux_sysroot) ldflags.append('--sysroot=' + linux_sysroot) ldflags.extend([ - '-static-libstdc++', + # When building with clang, this will default to trying to link to a + # static version of libc++, which we don't have in our toolchain. We + # only have the shared version, so let's not use the static version. + #'-static-libstdc++', '-Wl,--as-needed', ]) libs.extend([ |