summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: Search and enable the sqlite[3] pluginAlbert Astals Cid2019-02-127-17/+155
| | | | | | | | Added to QtFeature.cmake a way to be able to run feature_module begin and end without having an actual module by passing NO_MODULE Change-Id: Ib708bd3878e2591da193d18563c8932cc4b75e7f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix finding syncqt when "cross compiling"Simon Hausmann2019-02-121-0/+2
| | | | | | | | This is not quite the correct design yet, but makes the existing mechanism work first. Change-Id: Idbc6f1380adc955a772eb6e5beb6b3a5f7f686bb Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* Fix qt_config_compile_test when cross-compilingSimon Hausmann2019-02-121-4/+18
| | | | | | | | | | | | | | | | | | When we do qt_config_compile_test(egl_x11 LABEL "EGL on X11" LIBRARIES X11::X11 ... ) then check_cxx_source_compiles() aborts if the provided targets do not exist (we map LIBRARIES to CMAKE_REQUIRED_LIBRARIES). However we just want the test to fail. Therefore this patch verifies the presence of the targets. Change-Id: Ibd7c1b50d585339af0ca0de58bc5c9cd64d65d6d Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* cmake: Start to use ConfigExtra.cmake filesKevin Funk2019-02-127-404/+37
| | | | | | | | | | | | | | Enables the use of e.g. QT_NO_DEBUG in compiler flags, -fPIC, passing on of QT_NAMESPACE, etc. pp. Dropping a lot of custom code which handled adding imported targets for the command-line tools (this is all being handled by CMake already). It needs to be investigated if we need to resurrect Qt5GuiConfigExtras.cmake.in in one way or the other. Change-Id: I4fa141b68fddaad4f33e628c59d5d0b3a7b3a096 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Find mtdev and use itAlbert Astals Cid2019-02-124-2/+11
| | | | | Change-Id: I90db48efaa6a23add770fcf69b46c4f4c84866c1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: replace unused macro with a proper valueJean-Michaël Celerier2019-02-121-3/+3
| | | | | Change-Id: Icc2b5a63fc503aa99bbb0c8ee9ffddc985e0e3da Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* configurejson2cmake.py: openssl -> OpenSSL mappingAlbert Astals Cid2019-02-122-1/+2
| | | | | Change-Id: I29480dfbd4f144e3d5620b43419ec46fb866cf4b Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: Create Qt5 compat targets in config filesKevin Funk2019-02-127-23/+26
| | | | | | | | For now create targets a la "Qt5::Core" to stay compatible with the current Qt5 naming scheme. The name is controllable via a CMake option. Change-Id: If43c058221949b1900c2093f39ccc9d0f38028f1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Use consistent naming scheme for BootstrapKevin Funk2019-02-121-10/+11
| | | | | | | Required for a future patch Change-Id: I63f85e8fb41ae7c76cb39cce00e63d4cc77aef9d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Set up VERSION/SOVERSION properlyKevin Funk2019-02-121-0/+2
| | | | | Change-Id: Ic8cddf5ec8182873a6b1e03c76f514284b423322 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* CMake: Fix build of system jpeg is not availableKai Koehne2019-02-122-1/+4
| | | | | | Change-Id: Ie7462db556d0615e74755fa4fc3b51f625aade2f Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* configurejson2cmake.py: Don't emit a fixme for C++11 configAlbert Astals Cid2019-02-122-2/+4
| | | | | Change-Id: I8408f6126115a0f76b0fed2cc42b54e5c148821d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* configurejson2cmake.py: Support for the two cases that have LIBS +=Albert Astals Cid2019-02-122-10/+28
| | | | | | | | Since there's only two i hardcoded it for the moment instead of trying to parse the line Change-Id: I0da578af64ef9621cbbc78bf6ce15bf8a3f63f1c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: also write FIXME on the configure.cmake for 'use'Albert Astals Cid2019-02-124-22/+35
| | | | | | | Since most of the times it means we need to link with some other stuff Change-Id: I06262d4403225bca7a5e68d47145fefcf6702e5a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: blacklist xlib test, we can just use X11_FOUNDAlbert Astals Cid2019-02-122-19/+3
| | | | | Change-Id: Ic733c42e11b00fa8bf107f460a0596aeb10ac37b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Find Cups and enable its pluginAlbert Astals Cid2019-02-125-3/+45
| | | | | Change-Id: I44bf176587331d86eb147d106f28deb0a6618ab4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Blacklist the libinput_axis_api testAlbert Astals Cid2019-02-122-19/+4
| | | | | | | We already have a cmake find module for libinput so we know it is there Change-Id: I153544c5c13cb57b1ce258243ede17f4be9507fd Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: imageformats plugin needs an if guardAlbert Astals Cid2019-02-121-2/+20
| | | | | | | And add TODO for all the other missing plugins Change-Id: Ic1d3cb7398198aea37ccb4ed6c16fc64e454036a Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: Fixup paths to qvulkan* filesKevin Funk2019-02-111-6/+6
| | | | | Change-Id: Ifbd28e696c3cf64e008fa4617750b79f37ff1f8c Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: enable the compose pluginAlbert Astals Cid2019-02-112-1/+28
| | | | | | Change-Id: I0201b37531f7ba7380b2ca2f221283dda9a601a0 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 11:25:40 +0000