summaryrefslogtreecommitdiffstats
path: root/src/core/config/windows.pri
Commit message (Collapse)AuthorAgeFilesLines
* Add Desktop OpenGL backend for WindowsKai Koehne2014-09-251-2/+10
| | | | | | | | Enabling rendering into a WGL backbuffer, in addition to the EGL/angle one. Change-Id: I8f2e3f5ecf52b6db22712b1129059f462725a256 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Don't build release with debug info by default on WindowsJocelyn Turcotte2014-08-141-0/+3
| | | | | Change-Id: Idf4373bc10367dfc15445c4c530915cbda04ae9c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix the build on windows when qtwebengine.chromiumsrcdir isn't setJocelyn Turcotte2014-08-141-2/+1
| | | | | | | | | | | | | | | qtwe_chromium_obj_dir wasn't falling back to src/3rdparty if the config couldn't be found in git. Move the fallback logic to a getChromiumSrcDir qmake function, and use it in both places. The build system will now also print that the Chromium sources will follow the git config if found instead of the other way around, since this should now be the normal case as part of Qt5. Change-Id: I5ab972ab53156c1bd033518e2eb51013559491ac Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* 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>
* Move gyp defines to os specific config for WindowsZoltan Arvai2014-06-021-1/+1
| | | | | | | Currently some variables defined in os independent section. Change-Id: I661d840b2271dc4bccf98dc2a252feaf6907952c Reviewed-by: Michael Bruning <michael.bruning@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-281-0/+9
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>