summaryrefslogtreecommitdiffstats
path: root/src/gui/configure.pri
Commit message (Collapse)AuthorAgeFilesLines
* wasm: rename platform, refactor files and other thingsLorn Potter2018-07-161-1/+1
| | | | | | Task-number: QTBUG-69168 Change-Id: I78a3ad5e16fbb1046eedf2056583c022f7a27d5b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge remote-tracking branch 'gerrit/5.11' into HEADMorten Johan Sørvig2018-03-081-15/+0
|\ | | | | | | Change-Id: Id3a0e9482b35b5e4c79018e0c547d3c4ff48d9a5
| * xcb: re-factor QXcbKeyboard::updateKeymap() to remove various fallbacksGatis Paeglis2018-02-241-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3edcd9420e3ad661cad89420e18dbb70e7ad450b added more robust support for keyboard input on XKeyboard-less X servers. The various fallbacks that we had did not work that well in practice. We can remove them now. The xkb_keymap_new_from_names() function relies on reading XKB config files from a file system. Since we don't use this function anymore, we can also simplify xkb context creation (see XKB_CONTEXT_NO_DEFAULT_INCLUDES), as we don't care about DFLT_XKB_CONFIG_ROOT (which we previously set via -xkb-config-root for the bundled libxkbcommon). This patch also changes the code to use smart pointers for managing the global xkb context, keymap and state. [ChangeLog][X11] The -xkb-config-root command line switch has been removed as it it no longer needed when configuring with -qt-xkbcommon-x11. Change-Id: I80eecf83adae90af5cd20df434c1fba0358a12fd Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Introduce mkspec for web assemblyAndrew Knight2017-10-271-0/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mkspec and corresponding configuration adjustments make it possible to build/link the modules in qtbase and run simple applications using the stock emscripten compiler. Tested cross-compiled (-xplatform emscripten), but theoretically possible as a native build as well (requiring some binfmt_misc settings on Linux to run the resulting JS versions of host tools with node) *NOTE*: this currently requires passing -no-headersclean, as headersclean crashes the compiler. This was done outside of the wip/nacl branch because 1) we can use the new configure system and 2) most of the nacl patches don't apply to emscripten builds anyway. As emscripten can be used to build for raw JavaScript engines (e.g. nodejs) as well as web browsers, some differentiation between the compiler and the GUI platform (HTML5) has been added. Furthermore, a hypothetical "html5" QPA plugin has been referenced. TODO: - fix headersclean option - decide if we should disable pthreads support, as it requires Firefox and an experimental flag (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer) ... leading to either QT_NO_THREAD or an alternate implementation - break up the unrelated changes better (e.g. separate double-conversion patch) - provide better application/lib support for building dynamic libraries (currently, building an app links in the actual bitcode instead, and the ports libs are linked into the app instead of the correct Qt lib) - possibly improve the configure tests rather than selectively disabling configuration options unsupported by emscripten but for which the config.tests pass - check all examples, testcases, modules in other repositories... - benchmark performance Change-Id: I80cfa53605896ec8430df0b34bc1bce2c775d97f Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Fix freetype detection on QNXSamuli Piippo2016-11-071-1/+1
| | | | | | | | | | | | Pass qtConfLibrary_freetype test even when the .../freetype2 folder is not found, so that freetype and fontconfig config.tests are run. This fixes freetype detection on QNX, since the freetype headers are located in the default .../include folder. Task-number: QTBUG-56861 Change-Id: Ic8d72e6509195acd2d22a70603df850361f07b34 Reviewed-by: James McDonnell <jmcdonnell@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Clean up QT_QPA_DEFAULT_PLATFORM handlingJake Petroules2016-10-051-1/+3
| | | | | | | | This is now centralized in configure.pri except where it explicitly needs to be overridden. Change-Id: If829d6b5eecf9a5fc403d0a0600d12c9e5781525 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* fix freetype/fontconfig configure systemOswald Buddenhagen2016-10-041-0/+15
| | | | | | | | | | | | | | convert the ugly config.tests/[...]/freetype.pri file into a custom callback in configure.pri, and reinstate pkg-config use for freetype. subsequently, use QMAKE_USE for the actual library references. this fixes in particular cross-builds, as the new configure was not passing the necessary information to the test any more, so the old .pri file misbehaved. Task-number: QTBUG-54911 Change-Id: I5fc9c254334a2675f7db4d54df4c77637e8e2487 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Modularize configure.json/.priLars Knoll2016-09-151-0/+67
Move the different parts of configure.json/.pri into the libraries where they belong. Gui is not yet fully modularized, and contains many things related to the different QPA plugins. Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Change-Id: I6659bb29354ed1f36b95b8c69e7fce58f642053f Reviewed-by: Lars Knoll <lars.knoll@qt.io>