summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: build the ibus pluginAlbert Astals Cid2019-02-113-0/+34
| | | | | Change-Id: Ib2846204cc89b538ffe3b2282f7890f3de6ef33d Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: enable the xdgdesktopportal pluginAlbert Astals Cid2019-02-112-1/+22
| | | | | Change-Id: I97454ea918e3b34ca8a33bf221bcf9a0f5fa56f8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: find gtk3 and build the gtk3 platformthemeAlbert Astals Cid2019-02-116-1/+47
| | | | | Change-Id: I7db7321a2fd5ea0eda1924f3dece3b1c86d87d10 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: pro2cmake.py: Simplify condition generationTobias Hunger2019-02-111-18/+2
| | | | | | | | There is no need to try and avoid extra () and NOTs: Those will be removed by sympy later anyway. Change-Id: I39d3e4d1d829579e532bfbbf6c69e0f1e06e9a22 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* cmake: Find tslib and build the tslib plugin if foundAlbert Astals Cid2019-02-116-5/+31
| | | | | Change-Id: I7119ddf473a3ede29bbfef23cffb08a4fcbd5681 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: pro2cmake.py: Treat ANDROID_EMBEDDED as ANDROIDTobias Hunger2019-02-111-0/+1
| | | | | | | Treat ANDROID_EMBEDDED as ANDROID when simplifying conditions. Change-Id: I2cf0ea1e1a3e882e3a7b7276867dcee452866ade Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* CMake: pro2cmake.py: Do not go into infinite loopTobias Hunger2019-02-111-7/+14
| | | | | | | Do not go into an infinite loop when replacing a variable with itself. Change-Id: I2765b1c0c567753f26ca75e0533c1d193362b456 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* CMake: helper.py: Map harfbuzz libraryTobias Hunger2019-02-111-0/+1
| | | | | Change-Id: I71daa9acf391c70c6cba99609c1f67ca5eeaa220 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* cmake: QtFeature: Do not error out when using QtKevin Funk2019-02-111-2/+2
| | | | | | | | ... outside of qtbase.git Change-Id: I1895ef07c881766e2b28839d0422916b6916e10e Reviewed-by: Jean-Michaël Celerier <jean-michael.celerier@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: Make find_package(Qt5 ...) work properlyKevin Funk2019-02-114-45/+72
| | | | | | | | | | | | | Introduce a new cached variable INSTALL_CMAKE_NAMESPACE for defining the prefix used for CMake config files (c.f. "${PREFIX}Core/${PREFIX}CoreConfig.cmake") Also make sure to `find_dependency(...)` the required packages inside the individual CMake config files. I.e. in Qt5WidgetsConfig.cmake, search for Qt5Core, etc. pp.. Change-Id: Idc027925fe9d5323091c4853803ad5ce44b1afc6 Reviewed-by: Jean-Michaël Celerier <jean-michael.celerier@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix ARM buildSimon Hausmann2019-02-111-1/+0
| | | | | | | Don't try to build the MIPS draw helpers ;) Change-Id: If569aa41871d7e484e664382d71b8ef2b4025dce Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix build of neon accelerated drawing helpersSimon Hausmann2019-02-112-2/+2
| | | | | | | | We must instruct cmake that we're interested in providing input files for the assembler directly and the file name needs to be correct, too :) Change-Id: I7cccb6ac66d28261ee71869991b14ac20c63050e Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: Parse SYNCQT.INJECTIONSKevin Funk2019-02-111-1/+28
| | | | | | | | | Allows to install headers such as QtCore/qtconfig.h, QtGui/qvulkanfunctions.h, etc. Change-Id: I93f384cdc8bbee07fab316d7e232aae1d209f33e Reviewed-by: Jean-Michaël Celerier <jean-michael.celerier@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: build the offscreen platform plugin on macOSLiang Qi2019-02-111-1/+1
| | | | | | | This amends beace29a573df43b242d611f94bbd23af4232797. Change-Id: I38fef70687f36d3b2ab4ff9cd001dc35cc79942d Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: build libinput pluginAlbert Astals Cid2019-02-112-1/+20
| | | | | Change-Id: If263e6fa212f5349ad5e75252ff77ce0c92c5b75 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: build the tuiotouch pluginAlbert Astals Cid2019-02-112-1/+27
| | | | | Change-Id: I3e448fa8c21651a31429a87ee0b209eaea0fe1b1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: enable evdevtablet pluginAlbert Astals Cid2019-02-112-1/+20
| | | | | Change-Id: Ia2d8c88b4c36c7c6e71a49f42398ebd0378239c1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: Enable evdevkeyboard pluginAlbert Astals Cid2019-02-112-1/+20
| | | | | Change-Id: I74b000ce657dbc0573f97a095391902917fe8f80 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: enable evdevtouch pluginAlbert Astals Cid2019-02-112-1/+20
| | | | | Change-Id: I7c8a7bd6ce79ca6823c0e517ef80c9418b91e552 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: Enable evdevmouse pluginAlbert Astals Cid2019-02-113-0/+50
| | | | | Change-Id: I5c213a946d6127d635cd76bc827201e379e75aa9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: build the minimalegl platform pluginAlbert Astals Cid2019-02-112-0/+42
| | | | | Change-Id: I5c509efa30257be6ccc3455dd40bef3882b7e1da Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: gui/vulkan: Generate files in correct dirKevin Funk2019-02-111-1/+2
| | | | | | | | This is where headers.pri expects them Change-Id: If518704ae7bfcae3e898a0da61f9b1e6ae6effbb Reviewed-by: Jean-Michaël Celerier <jean-michael.celerier@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: don't die when running on macOSAlbert Astals Cid2019-02-111-2/+2
| | | | | | | still same result for me on Linux Change-Id: Icb74ffc5989c0b96f069f6ec33c2a707e012414b Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: fix harfbuzz targetLiang Qi2019-02-111-1/+1
| | | | | | | | | If doesn't build with harfbuzz::harfbuzz, please check harfbuzz-config.cmake in system. Latest harfbuzz has it. Change-Id: Idaaa77dc748ba2228b4e67e72a495bed93bc0192 Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: Fix build widgets on macOSМихаил Светкин2019-02-111-5/+5
| | | | | Change-Id: I9c7b7e1677f665861f8a106244468bdc0e1386f2 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix linkage against freetypeSimon Hausmann2019-02-111-0/+1
| | | | | | | | | Target "XcbQpa" links to target "Freetype::Freetype" but the target was not There was indeed a find_package(Freetype) missing Change-Id: I486adbcf3b4ed0ae849a11294e2b83d2dc45d66f Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: build glxconvenienceAlbert Astals Cid2019-02-112-0/+28
| | | | | Change-Id: Iad09a86d11565665bb06d8d5d5616fc1b35ad777 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: build the offscreen platform pluginAlbert Astals Cid2019-02-112-0/+49
| | | | | Change-Id: I6ccd430a2779fb889329cd411221c29b2601acfb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: build minimal platform pluginAlbert Astals Cid2019-02-112-0/+41
| | | | | Change-Id: Icd80b33e2840ab1d34d2502bfdc3cb9116bdfba4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Build platformcompositorAlbert Astals Cid2019-02-112-0/+21
| | | | | Change-Id: Ib9855e8ce0abddf5dce3408f10d3c2d32a2df937 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: build eglconvenienceAlbert Astals Cid2019-02-112-0/+41
| | | | | Change-Id: Iba578190feb06953bfcba62978d2ba5b7ff35cb7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: build linuxfb platform pluginAlbert Astals Cid2019-02-112-0/+48
| | | | | Change-Id: I74c84ca410bdcf9c46828c5da903e241b2fa5d0d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: build kmsconvenienceAlbert Astals Cid2019-02-112-0/+24
| | | | | Change-Id: I3e1cdb4b9dd26a74262a183d8137ed2011a6e52d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Use the proper libudev libraryAlbert Astals Cid2019-02-111-1/+1
| | | | | Change-Id: I884756473a8c26a4ef17472aaaceb94509d3c72f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: enable src/platformsupport/inputAlbert Astals Cid2019-02-112-0/+108
| | | | | Change-Id: Iafe75f55c579779d3d25a0147d993904622161fa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: we need to find for libudev not udevAlbert Astals Cid2019-02-111-1/+1
| | | | | Change-Id: I36bac8c01d8de2b151c3d4d89607d26ac8add3d2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: we need two different qmyserver namesAlbert Astals Cid2019-02-112-3/+1
| | | | | | | | | All the binaries now end up in bin/ and since the two qmyservers used for testing dbus have slightly different implementations we need both, so rename one to qmyserver_qdbusinterface Change-Id: I1db1aa8f96f35c6ca41254295e2477c35f915850 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* cmake: QtFeature add debugging aidKevin Funk2019-02-111-1/+1
| | | | | | | Persist the target name in the CMake cache description Change-Id: I124a8b89e5845d12301993b0546c8d5c91b8d8bb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Do not rerun try_compile invocationsKevin Funk2019-02-111-0/+4
| | | | | Change-Id: I5eccf9f810d7ee55a311884bd5cf483f8086bae6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* CMake: pro2cmake.py: Handle equals(foo, bar) in conditionsTobias Hunger2019-02-111-0/+2
| | | | | | | | This adds an overly simplistic mapping -- just like it does for the rest of the qmake test functions. Change-Id: I0c9e3b70c1c3d0c68a245706a141aa7b7cb4d8bf Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* Fix make installSimon Hausmann2019-02-111-1/+1
| | | | | | | Pick up mkspecs/ from the top-level project (qtbase) directory Change-Id: I78c69f31219484cc7eaa408b0a7e3eeaa0ac6cf2 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* Require cmake 3.14 properSimon Hausmann2019-02-111-3/+1
| | | | | | | It appears that the latest cmake provides 3.14 as a proper version. Change-Id: Ib0f0a1bbdd11e2129f25618b412015a2456aaba1 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: Fix linking of the opengles testsAlbert Astals Cid2019-02-111-0/+4
| | | | | | | | The FindOpenGL.cmake file in cmake has a comment that is not very reassuring this should work, but it actually works for me Change-Id: I05b0ac6ec551252f8c58ab7abf4254d2d09a069c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Ignore cmake build directories that are typically in placeSimon Hausmann2019-02-111-0/+3
| | | | | Change-Id: Icc31c4ac348bd55af383626ff86cae91e695d274 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: Fix linking of the libinput_axis_api testAlbert Astals Cid2019-02-111-0/+2
| | | | | Change-Id: I7b70643e013b01d48f347bd5b3db9506793e46a4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: Fix linking of the egl_x11 testAlbert Astals Cid2019-02-111-0/+2
| | | | | Change-Id: Id350e1cf85de67d1f27f6bfc94316bed115b377f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Add moc dependency also to CorePrivateAlbert Astals Cid2019-02-111-0/+2
| | | | | | | | | Otherwise if you start a make -j14 in src/sql without having built anything it would hang because sql only depends on CorePrivate and not Core and thus moc would not be build at the right time Change-Id: I916242782e6aea4a0491d870391f91182959ca7c Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* test: Make qheaderview test buildAlbert Astals Cid2019-02-112-3/+5
| | | | | | | | | | | it's using deprecated reset() model that we don't support anymore since "this is Qt6", so include the 2 lines in the code. This makes for bad code but since it's a test and it used to work i guess it's good enough Change-Id: Ia906fe40359ddc0defb10795cf12a17498124983 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: pro2cmake.py: Expand qmake values in file names, etc.Tobias Hunger2019-02-111-19/+45
| | | | | | | | | | | | | | | Expand qmake values when dealing with source file names, include directories and more. This handles cases where variables are used to refer to sources (e.g. $$VERSIONTAGGING_SOURCES in corelib) as well as things like $$QT_SOURCE_TREE and friends. Note that $$PWD and $$OUT_PWD are still need hand-holding since they refer to the scopes directory relative to the top level directory -- which pro2cmake.py does not know. Change-Id: I011ef55416ff820053d5f844b3008836849f5075 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: pro2cmake.py: Better mapping of complex conditionsTobias Hunger2019-02-111-5/+5
| | | | | | | | | | | | .pro-files support things like contains(Foo, bar), etc. Map that in such a way that only one identifier will be visible to CMake to unconfuse the logic handling on that side. These conditions will need manual fixup later! Change-Id: Id4946e694a9adccf9f54bcce26a6c227cd921007 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 07:50:20 +0000