diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-02 14:48:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-01 16:56:06 +0000 |
| commit | 4d61ba751088f650fe5d22bbf88036e80ff19f0f (patch) | |
| tree | a1583bd501cfd675655396775108a9b7b3881b95 /src/core/config | |
| parent | 06a60e33c6101d725d8b88d4e3c647b9b2d3e7ab (diff) | |
Basic porting to Chromium 51
Trivial changes in methods, arguments and types.
Change-Id: Ic707c376249f816268223e696ed5f6251df1f85f
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/common.pri | 4 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 2 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 8 | ||||
| -rw-r--r-- | src/core/config/windows.pri | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 5822bc589..01c942976 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -2,10 +2,10 @@ # Trigger Qt-specific build conditions. GYP_CONFIG += use_qt=1 +# Enable printing. We enable preview because we use preview logic even if we don't support preview. +GYP_CONFIG += enable_basic_printing=1 enable_print_preview=1 # We do not want to ship more external binary blobs, so let v8 embed its startup data. GYP_CONFIG += v8_use_external_startup_data=0 -# Disable printing since we don't support it yet -GYP_CONFIG += enable_basic_printing=1 enable_print_preview=0 # WebSpeech requires Google API keys and adds dependencies on speex and flac. GYP_CONFIG += enable_web_speech=0 # We do not use or even include the extensions diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 4cb7d89fb..c8f0b82de 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -17,7 +17,7 @@ GYP_CONFIG += \ enable_managed_users=0 \ enable_plugin_installation=0 \ enable_plugins=0 \ - enable_printing=0 \ + enable_print_preview=0 \ enable_session_service=0 \ enable_task_manager=0 \ enable_themes=0 \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 8854a4bdf..fcbdbe27a 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -22,10 +22,14 @@ GYP_CONFIG += \ use_openssl=1 use?(nss) { - GYP_CONFIG += use_nss_certs=1 \ + GYP_CONFIG += \ + use_nss_certs=1 \ + use_nss_verifier=1 \ use_openssl_certs=0 } else { - GYP_CONFIG += use_nss_certs=0 \ + GYP_CONFIG += \ + use_nss_certs=0 \ + use_nss_verifier=0 \ use_openssl_certs=1 } diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 08b8401ba..ff86aea70 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -64,7 +64,7 @@ msvc { GYP_ARGS += "-G msvs_version=$$MSVS_VERSION" - isBuildingOnWin32(): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/8.1\"" + isBuildingOnWin32(): GYP_ARGS += "-D windows_sdk_path=\"C:/Program Files/Windows Kits/10\"" } else { fatal("Qt WebEngine for Windows can only be built with the Microsoft Visual Studio C++ compiler") |