summaryrefslogtreecommitdiffstats
path: root/src/gui/configure.pri
Commit message (Collapse)AuthorAgeFilesLines
* 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>