diff options
-rw-r--r-- | src/core/config/common.pri | 8 | ||||
-rw-r--r-- | src/core/config/embedded_qnx.pri | 2 | ||||
-rw-r--r-- | src/core/config/linux.pri | 2 | ||||
-rw-r--r-- | src/core/config/mac_osx.pri | 2 | ||||
-rw-r--r-- | src/core/config/windows.pri | 2 | ||||
-rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 5 |
6 files changed, 16 insertions, 5 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri new file mode 100644 index 000000000..793e26a61 --- /dev/null +++ b/src/core/config/common.pri @@ -0,0 +1,8 @@ +# Shared configuration for all our supported platforms + +# Trigger Qt-specific build conditions. +GYP_CONFIG += use_qt=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=0 enable_print_preview=0 diff --git a/src/core/config/embedded_qnx.pri b/src/core/config/embedded_qnx.pri index 7fd35c976..34470d2d8 100644 --- a/src/core/config/embedded_qnx.pri +++ b/src/core/config/embedded_qnx.pri @@ -1,5 +1,7 @@ GYP_ARGS += "-D qt_os=\"embedded_qnx\" -I config/embedded_qnx.gypi" +include(common.pri) + GYP_CONFIG += \ disable_nacl=1 \ enable_plugins=0 \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 9868d6848..1035e950e 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -1,3 +1,5 @@ +include(common.pri) + # linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug) # Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system. GYP_CONFIG += \ diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index 93c77623c..940b47982 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -1,3 +1,5 @@ +include(common.pri) + QMAKE_CLANG_DIR = "/usr" QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) !isEmpty(QMAKE_CLANG_PATH) { diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 1e875f308..760ed5b6f 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -1,5 +1,7 @@ GYP_ARGS += "-D qt_os=\"win32\" -I config/windows.gypi" +include(common.pri) + GYP_CONFIG += \ disable_nacl=1 \ remoting=0 \ diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index c8e849973..ee09de973 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -153,11 +153,6 @@ if __name__ == '__main__': args.extend(['-D', 'qtwebengine_root=' + purifyGypVarPath(qtwebengine_root)]) args.extend(['-D', 'chromium_src_dir=' + purifyGypVarPath(chrome_src)]) - args.extend(['-D', 'clang_use_chrome_plugins=0']) - # We do not want to ship more external binary blobs, so let v8 embed its startup data. - args.extend(['-D', 'v8_use_external_startup_data=0']) - # Trigger Qt-specific build conditions. - args.extend(['-D', 'use_qt=1']) # Tweak the output location and format (hardcode ninja for now if not set) args.extend(['--generator-output', '.']) args.extend(['-Goutput_dir='+ os.path.relpath(output_dir, qtwebengine_root)]) |