summaryrefslogtreecommitdiffstats
path: root/src/core/config
Commit message (Collapse)AuthorAgeFilesLines
* Fix define in windows.priZoltan Arvai2014-07-151-1/+1
| | | | | | | GYP_ARGS needs a -D option before defining a value. Change-Id: I4acb78e3f201a5d7369c3e998eb7356769bb7553 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Enable Chromium on Windows to link to correct ANGLE configuration.Michael Brüning2014-07-031-0/+3
| | | | | | | | | | | | This is done by setting qt_egl_library and qt_glesv2_library to the correct value depending on whether the build is using debug or release config. This also updates the 3rdparty submodule as necessary. Change-Id: I536310073d1d2436f7ed529b935421f6c9a8cae9 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Define mac_sdk_min and mac_deployment_target instead of mac_sdk_pathAndras Becsi2014-06-041-2/+5
| | | | | | | | | | With Qt 5.3 mac_sdk_path ends up being empty, so make sure to set the proper flags for chromium to pick the right sdk. Also add clang_use_chrome_plugins=0 so we can remove it as well from the Mac-Use-libc-instead-of-stdlibc patch. Change-Id: Ia132f079f905761644ad26c728f7116f538ea62d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Move gyp defines to os specific config for WindowsZoltan Arvai2014-06-022-1/+9
| | | | | | | Currently some variables defined in os independent section. Change-Id: I661d840b2271dc4bccf98dc2a252feaf6907952c Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Add initial build configuration for QNX.Jeff Rogers2014-05-162-0/+18
| | | | | | | | QNX is using Ozone, so exclude gl_context_ozone as well. Change-Id: Icdad9eed3211e9b095fbf884bc5e0243b551c1bb Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Arvid Nilsson <anilsson@blackberry.com>
* Fix audio not being built on desktop LinuxJocelyn Turcotte2014-05-131-2/+0
| | | | | Change-Id: Idaf5264304d09ae7b2bfe0abee7c53310b50b48f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update eAndroid for new snapshotAndras Becsi2014-04-241-0/+67
| | | | | | | This patch adds configurations and updates command line switches. Change-Id: I0223695cc3a743bb2364a73e56fe5391dc43663d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Sort embedded_linux.pri alphabetically.Zeno Albisser2014-04-091-11/+11
| | | | | Change-Id: Ie907ade6c4888f450ee22d4d6bfd00f0e2d1fa09 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Do not use aurax11 clipboard on embedded linux.Zeno Albisser2014-04-091-0/+1
| | | | | Change-Id: I0ed2bd7f27bfba863331390bd5630b552cd41af4 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add GLContextHelper class for EGL context creation.Zeno Albisser2014-04-092-1/+10
| | | | | | | | | | | | | | | | | | | | Shared EGL contexts should always be created on the same thread, as otherwise context creation might fail. We use a GLContextHelper singleton that is initialized on startup and creates the contexts when requested through a BlockingQueuedConnection. There is a pretty and a correct solution for this problem. This is the pretty one. It is based on the assumption that Chromium decides to use the same or a similar enough configuration for the EGLContext as Qt previously did. But we prefer pretty over correct as the correct solution would potentially impose a layering violation. This is enabled for all embedded linux devices. Change-Id: I910cc90d0f87fd6d1fe0a475b17ba56cd8c503f6 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add more options for gyp on WindowsZoltan Arvai2014-03-281-0/+8
| | | | | | | | Turning off gyp's parallel processing that broken on Windows. Disable nacl, remoting and ash. Change-Id: If695799f94111135fcdf4130180e998d0094055d Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Introduce platform specific pri files for all platforms.Zeno Albisser2014-03-285-0/+69
| | | | | | | | Define qt_os for all supported platforms. Move simple platform specific flags into the pri files. Change-Id: I09b030f4a8a815f48a8100d81669a7729218efc2 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Get rid of GTK dependenciesAndras Becsi2014-03-281-0/+16
Build with aura by default and remove GTK related code. This patch introduces a mechanism for setting gyp build configuration variables using a GYP_CONFIG and adds a desktop_linux.pri configuration for this target. Change-Id: I6b044ba52ebb20c187572669af94a6fc280b0412 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 12:43:06 +0000