summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Regenerate src/plugins/imageformatsTobias Hunger2019-05-064-12/+35
| | | | | Change-Id: Iea0f1b5f51508b7e8c2cad405dd3e293186c583a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/plugins/bearerTobias Hunger2019-05-064-10/+19
| | | | | Change-Id: I6c900247eb03b8afc3f299b5dbca5bac64527a52 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Scripts: Fix double entries in 3rd party library mappingTobias Hunger2019-05-061-2/+2
| | | | | Change-Id: I35f29876874d6083d19382800d194e417d57bca1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/platformsupport/kmsconvenienceTobias Hunger2019-05-061-3/+7
| | | | | Change-Id: I2608275ca7cd5315e7ffdffbb25f78e98fbf9bc3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/platformsupport/platformcompositorTobias Hunger2019-05-061-1/+4
| | | | | Change-Id: I435fb110ad59eb197401c6d8090c697ceb4cf687 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/pluginsTobias Hunger2019-05-061-8/+12
| | | | | Change-Id: I64f920e909de7c612e3ab18b8aa31b98e0e1acfd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate platformsupport/windowsuiautomationTobias Hunger2019-05-061-1/+4
| | | | | Change-Id: I17c927cf7eb8c66ee941a2d91c918e105474da29 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate platformsupport/vkconvenienceTobias Hunger2019-05-061-1/+6
| | | | | | | This does not link to vulkan, just as it did before. Feels wrong... Change-Id: I7e76e03e95ed33421de684f51c9943a84dde7779 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate platformsupport/themesTobias Hunger2019-05-061-1/+4
| | | | | Change-Id: Ica4b4c3f2a5f86476f179a01aea5eeb25e617a98 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate platformsupport/servicesTobias Hunger2019-05-061-2/+5
| | | | | Change-Id: I73444aeef2e37ebb2f90e8bae3e6932989bad5f0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate platformsupport/linuxaccessibilityTobias Hunger2019-05-061-3/+9
| | | | | | | Use ATSPI with nolink! Change-Id: I334fa93364109ca04b4312d12ddcea34d9e9a103 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate platformsupport/graphicsTobias Hunger2019-05-061-1/+4
| | | | | Change-Id: Ifff85f70de092ade438430d71d9a149f49363c14 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate platformsupport/fontdatabasesTobias Hunger2019-05-061-16/+24
| | | | | | | This one does actually contain functionality changes, but those look OK to me. Change-Id: I5fd2caee16da86c529e1c83ca66452f780e54e26 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate platformsupport/fbconvenienceTobias Hunger2019-05-061-1/+4
| | | | | Change-Id: Ic838debdca48553252cb4c32ec8a42695ba24b46 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate platformsupport/eventdispatchersTobias Hunger2019-05-061-2/+6
| | | | | Change-Id: Ie9cbee3fcb58673c08e8378382dd45e61fc4ff01 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/platformsupport/edidTobias Hunger2019-05-061-1/+3
| | | | | Change-Id: Id567354daa47c0be07211ebf01f92cd01be9a5c7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/platformsupport/devicediscoveryTobias Hunger2019-05-061-1/+3
| | | | | Change-Id: Ia306a7197c10fffb520e90eead449c551f0dfbe8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/platformsupport/clipboardTobias Hunger2019-05-061-2/+4
| | | | | Change-Id: I6e61274a2f5796a6b4ddcbbdf03c345a03e4b91a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/platformsupport/accessibilityTobias Hunger2019-05-061-1/+4
| | | | | Change-Id: Ie250afa3b4dc6c5750dd3cd15c1e83edcb7e0734 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/platformsupportTobias Hunger2019-05-061-22/+24
| | | | | Change-Id: I883573633dbd82ebcca9cc0dc435cd867cec24b8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/concurrentTobias Hunger2019-05-061-6/+9
| | | | | Change-Id: I888f0a3821c091180928949bd52ea70a1be69d3f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/platfomheadersTobias Hunger2019-05-061-7/+10
| | | | | Change-Id: I82d94c0f53bf3291cd26188ab6afd78493f2b92c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/openglTobias Hunger2019-05-061-7/+9
| | | | | Change-Id: I6a140b18f12cb048e2b113fb1cef38e224cc8417 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate src/dbusTobias Hunger2019-05-061-7/+9
| | | | | Change-Id: Iff9890ead883bac5f75425a2d0367e639d648399 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix special cases in networkAlexandru Croitor2019-05-061-1/+3
| | | | | Change-Id: I66cc33afe3bfdf4e86dfeb0b341770355f59c0da Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix special cases in widgetsAlexandru Croitor2019-05-061-1/+1
| | | | | Change-Id: I026a321a916885ccd93361da91bc3ce6fb6f6ad1 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: Improve mapping of librariesTobias Hunger2019-05-036-18/+34
| | | | | | | | | | | | | Merge all data related to mapping libraries into one data structure in helper.py. Use that data for everything related to library mapping. This change enables way more features now like e.g. adding find_package calls into generated files. Change-Id: Ibbd2a1063cbeb65277582d434a6a672d62fc170b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* CMake: configurejson2cmake: Do not generate useless OPTIONALsTobias Hunger2019-05-036-36/+2
| | | | | | | | | | Do not set properties of packages to type OPTIONAL. That is the default anyway. Update generator script and generated files. Change-Id: I7a4d043b69c93ce8c2929a2e27ac6a07e4e6d8cc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix linking on systems where there's no libGLX.so but mesa provides bindingsSimon Hausmann2019-05-031-2/+2
| | | | | | | | | Behave like qmake and link against libGL simply. This happened in offscreen.pro implicitly through QT += gui-private and needs to happen explicitly here by using the CONFIG += opengl equivalent: WrapOpenGL. Change-Id: I396c2256c89f4560bb7f936f7540b33c754b9eda Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* cmake: Fix xcb_glx buildAlbert Astals Cid2019-05-031-1/+1
| | | | | | | Use the actual cmake library target name Change-Id: Icda1d232e3b920bf33ebceb00f39682050f7dedd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* cmake: make the qt_find_package PROVIDED_TARGETS optionalJean-Michaël Celerier2019-05-031-1/+1
| | | | | | | | | | This is because some FindPackage may produce some targets only on some platforms - e.g. qt_find_package(OpenGL) needs to define the provided target OpenGL::GLX which will only exist on linux but is required by various CMakeLists.txt files. Change-Id: I74515470f5d56c246f489df74901ad4223a92a70 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Revert "CMake: better GLX detection"Simon Hausmann2019-05-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the build when GLX is available. In the .pro files as well as the .cpp files the condition of enabling GLX support is based on the Qt feature system (xlib && opengl && !opengles2). The change to replace the !opengles check with a cmake target check is incomplete for two reasons: (1) the target check would _never_ succeed because there was no find_package() call in scope that would create the target. (2) when the target is found, the .cpp code that checks for the features would fail, because that continues to use the !opengles2 condition -- the preprocessor can't know about cmake targets. So this reverts commit 1361cf5d50e0baa901c06cab7f87785a03c57cb7 and instead calls for an investigation why in Ville's machine desktop gl was disabled. Change-Id: I9a7957224f81b800282c260dee8abcd421fdbc9e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: add CMakeLists.txt files for xcb/gl_integrationsLiang Qi2019-05-024-1/+94
| | | | | Change-Id: I34bc3c0ab4b4b686fe57149a3bb69e2d2cafd551 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* cmake: Fix Vulkan qt_find_package callJean-Michaël Celerier2019-05-021-1/+1
| | | | | Change-Id: I4494d6d7dc2cd0b5afed5bb9d591b62627cbc49d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* cmake: remove mirclient TODOAlbert Astals Cid2019-05-021-4/+0
| | | | | | | mirclient qpa code was removed in 8c73ddd8e3fb43cc22fa111b855ab1f9f5b83405 Change-Id: I0c0f5228fb750b69a742c9d1d8377b4a4de165ce Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix build by re-generating CMakeLists.txt from offscreen.proSimon Hausmann2019-05-021-5/+1
| | | | | | | | We don't need the _dummy.cpp files in the build anymore that don't exist anyway. Change-Id: I70e12dd39009c86779f3863c945e835b76cb24f6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: better GLX detectionVille Voutilainen2019-05-022-3/+7
| | | | | Change-Id: I71dfbb331cb02a3249b0c3c65f2a9bd9ce68c739 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: add xcb platform pluginLiang Qi2019-05-021-0/+39
| | | | | Change-Id: I9b3e8b5e4a2f7799b32738319e6eed912d3261e2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* cmake: export locally-built dependencies in static buildJean-Michaël Celerier2019-05-023-2/+16
| | | | | Change-Id: Ifbcedd32cef3b9c8b4b8c9ca0d229850f696f406 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Write find_dependency() calls in Qt Module config filesAlexandru Croitor2019-05-0233-81/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces a new function called qt_find_package() which can take an extra option called PROVIDED_TARGETS, which associates targets with the package that defines those targets. This is done by setting the INTERFACE_QT_PACKAGE_NAME and INTERFACE_QT_PACKAGE_VERSION properties on the imported targets. This information allows us to generate appropriate find_dependency() calls in a module's Config file for third party libraries. For example when an application links against QtCore, it should also link against zlib and atomic libraries. In order to do that, the library locations first have to be found by CMake. This is achieved by embedding find_dependency(ZLIB) and find_dependency(Atomic) in Qt5CoreDependencies.cmake which is included by Qt5CoreConfig.cmake. The latter is picked up when an application project contains find_package(Qt5Core), and thus all linking dependencies are resolved. The information 'which package provides which targets' is contained in the python json2cmake conversion script. The generated output of the script contains qt_find_package() calls that represent that information. The Qt5CoreDependencies.cmake file and which which dependencies it contains is generated at the QtPostProcess stop. Note that for non-static Qt builds, we only need to propagate public 3rd party libraries. For static builds, we need all third party libraries. In order for the INTERFACE_QT_PACKAGE_NAME property to be read in any scope, the targets on which the property is set, have to be GLOBAL. Also for applications and other modules to find all required third party libraries, we have to install all our custom Find modules, and make sure they define INTERFACE IMPORTED libraries, and not just IMPORTED libraries. Change-Id: I694d6e32d05b96d5e241df0156fc79d0029426aa Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Export tool config and target files for each relevant moduleAlexandru Croitor2019-05-0212-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake will now generate config and target files for each module that provides tools. As a result, namespaced global targets such as Qt5::moc or Qt5::rcc can be made available. Third party projects that require just these tools, and not the Qt modules themselves, should specify CMAKE_PREFIX_PATH pointing to the installed Qt location, and call find_package(Qt5CoreTools), find_package(Qt5GuiTools), etc. It is also possible to call find_package(Qt5Tools REQUIRED Core Widgets) where the last option is a list of modules whose tools should be imported. Note that all the tools are in the Qt5:: namespace and not in the Qt5CoreTools:: or Qt5WidgetsTools:: namespace. This commit also changes the behavior regarding when to build tools while building Qt itself. When cross compiling Qt (checked via CMAKE_CROSSCOMPILING) or when -DQT_FORCE_FIND_TOOLS=TRUE is passed, tools added by add_qt_tool will always be searched for and not built. In this case the user has to specify the CMake variable QT_HOST_PATH pointing to an installed host Qt location. When not cross compiling, tools added by add_qt_tool are built from source. When building leaf modules (like qtsvg) that require some tool that was built in qtbase (like moc), the module project should contain a find_package(Qt5ToolsCore) call and specify an appropriate CMAKE_PREFIX_PATH so that the tool package is found. Note that because HOST_QT_TOOLS_DIRECTORY was replaced by QT_HOST_PATH, the ensure syncqt code was changed to make it work properly with both qtbase and qtsvg. Here's a list of tools and their module associations: qmake, moc, rcc, tracegen, qfloat16-tables, qlalr -> CoreTools qvkgen -> GuiTools uic -> WidgetTools dbus related tools -> DBusTools Task-number: QTBUG-74134 Change-Id: Ie67d1e2f8de46102b48eca008f0b50caf4fbe3ed Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Make freetype a required packageAlexandru Croitor2019-05-011-1/+1
| | | | | | | | | With qmake if we don't find a system package, we use the bundled one. With CMake we don't provide a bundle freetype, hence it's required to find a system one (or custom provided one). Change-Id: I00a5e2ac55459957dae0729f89bafa792a102152 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove the Gui extra cmake file which was restored during the mergeAlexandru Croitor2019-04-171-193/+0
| | | | | | | | | | When building qtsvg, the file gets picked up while doing find_package(Qt5Gui) and fails the configuration phase. Remove it as it was done before. Change-Id: I3499e33ecc129e31f8d3b144ee6370b2a9bb4f9a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'gerrit/dev' into wip/cmakeTobias Hunger2019-04-1613-179/+420
|\ | | | | | | Change-Id: I2e1812e4f40131ff74919aa3b558db5c261fe412
| * uic: Do not generate Q_UNUSED for PythonFriedemann Kleint2019-04-161-1/+1
| | | | | | | | | | | | Task-number: PYSIDE-797 Change-Id: Id269af024c03c2c586d440659bb6c49c3d6eedc6 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| * android: Properly indicate successful Qt installRob Samblanet2019-04-151-25/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch ensures that installed files are written to physical disk before the 'cache.version' file is written. QtLoader.java uses the 'cache.version' file written during self-installation to indicate whether re-installation is necessary. The 'cache.version' file, however, was being written at the start of installation, so its existence merely indicated that the installation was attempted. In the case of power loss during installation, the existence of 'cache.version' would prevent retrying installation on the next launch, so the bad installation was irrecoverable. [ChangeLog][Android] Fixed an issue where an application installation would be irrecoverably broken if power loss or a crash occurred during its first initialization run. Fixes: QTBUG-71523 Change-Id: If771b223a0a709a994c766eea5a4ba14ae95201e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * tslib: use ts_setup() to find the deviceRolf Eike Beer2019-04-152-22/+6
| | | | | | | | | | | | | | | | | | | | This automatically searches for some default devices. This not only reduces the amount of code, it also makes sure that Qt will by default find the same input devices that tslib (e.g. ts_calibrate) will find. Fixes: QTBUG-74680 Change-Id: Ied3fff7e8ed9d6637d2b8cf32119660133d251a3 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * Avoid debug messages for not implemented "grab" methodsMartin Koller2019-04-141-0/+3
| | | | | | | | | | Change-Id: Ie32b5d261854703fa17bb844cf8354709b031a4c Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Add Extended RGB model to QColorAllan Sandfeld Jensen2019-04-124-67/+229
| | | | | | | | | | | | | | Can be used to represent wide-gamut and HDR colors. Change-Id: I1cca442069ce2f2c070f723fe930fe1f2f5580ad Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * uic: Port WriteInitialization::writeBrush() be able to generate PythonFriedemann Kleint2019-04-121-19/+27
| | | | | | | | | | | | Task-number: PYSIDE-797 Change-Id: I7c4e204a5ac9be2dee8f06c38323a15a0372fe5c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 21:39:26 +0000