summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate sqlAlexandru Croitor2019-05-201-9/+12
| | | | | Change-Id: I495678a5c77557ae297b7dd028f1253ebcce9ef7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Regenerate printsupportAlexandru Croitor2019-05-201-6/+8
| | | | | | | No .prev file cause it's a clean conversion. Change-Id: I33e02dccb9c8da336891c36cd0e1454d29152065 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Regenerate platformheadersAlexandru Croitor2019-05-201-0/+2
| | | | | | | And add the first version of the .prev file. Change-Id: I87d33dd175ddcbccd202f068f469f260944e4ada Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Regenerate concurrentAlexandru Croitor2019-05-201-1/+1
| | | | | Change-Id: Iccb993e7e38dc04be2e3960d0f49ddf241c675e7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Regenerate dbusAlexandru Croitor2019-05-201-0/+73
| | | | | | | And add the first version of the .prev file. Change-Id: I8375591a8cfc087291774370b8308c808dd5f0b4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Regenerate openglAlexandru Croitor2019-05-202-1/+66
| | | | | | | And add the first version of the .prev file. Change-Id: I96f27bce6d1c3107fb8c7b3758b29cfd944cf374 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Regenerate networkAlexandru Croitor2019-05-202-1/+425
| | | | | | | And add the first version of the .prev file. Change-Id: I9d298e483032081a02a63b4f887f4d682ea7ccd4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Regenerate widgetsAlexandru Croitor2019-05-202-19/+813
| | | | | | | And add the first version of the .prev file. Change-Id: I901c413997dcc497da5e45b1675726180c84e709 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Regenerate guiAlexandru Croitor2019-05-202-1/+528
| | | | | | | And add the first version of the .prev file. Change-Id: Ie5fba879b8fdb670d4331d4df524ffb5bad3303e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Use the qt_build_repo() macros for building qtbase as wellAlexandru Croitor2019-05-151-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | To implement this, create a new Qt5BuildInternals package. All child Qt modules like qtsvg should use find_package(Qt5BuildInternals) or find_package(Qt5 COMPONENTS BuildInternals) in the their top level CMakeLists.txt. This will make the qt_build_repo() macros available. For qtbase we slightly cheat, and specify a CMAKE_PREFIX_PATH pointing to the source folder that contains the BuildInternals package. For the other modules we actually use a configured and installed package Config file. This change moves variables that used to be written into the QtCore Config file into the BuildInternals package. This way things that are relevant only for building additional Qt modules does not pollute the QtCore package. Task-number: QTBUG-75580 Change-Id: I5479adff2f7903c9c2862d28c05c7f485ce3e4eb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Encapsulate commands for building other repos into two macrosAlexandru Croitor2019-05-151-0/+23
| | | | | | | | | | | | | | | | | | | Currently to build qtsvg we have some copy-pasted code to set up the paths for QtSetup and QtPostProcess to be found. To make it cleaner, introduce two new macros called qt_build_repo_begin and qt_build_repo_end(). The first one should be called in a child repo like qtsvg, right after a find_package(Qt5) call, and the second one at the end of the repo top-level CMakeLists.txt file. In order for the macros to work, extract some of the variables which were set in Qt5Config into Qt5CoreConfig instead. This makes sure that it works also for find_package(Qt5Core) calls. Task-number: QTBUG-75580 Change-Id: I85267c6bd86f9291ec2e170fddab1006ab684b5c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Implement developer / non-prefix buildsAlexandru Croitor2019-05-151-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A non-prefix build is a build where you don't have to run make install. To do a non-prefix build, pass -DFEATURE_developer_build=ON when invoking CMake on qtbase. Note that this of course also enables developer build features (private tests, etc). When doing a non-prefix build, the CMAKE_INSTALL_PREFIX cache variable will point to the qtbase build directory. Tests can be run without installing Qt (QPA plugins are picked up from the build dir). This patch stops installation of any files by forcing the make "install" target be a no-op. When invoking cmake on the qtsvg module (or any other module), the CMAKE_INSTALL_PREFIX variable should be set to the qtbase build directory. The developer-build feature is propagated via the QtCore Config file, so that when building other modules, you don't have to specify it on the command line again. As a result of the change, all libraries, plugins, tools, include dirs, CMake Config files, CMake Targets files, Macro files, etc, will be placed in the qtbase build directory, mimicking the file layout of an installed Qt file layout. Only examples and tests are kept in the separate module build directories, which is equivalent to how qmake does it. The following global variables contain paths for the appropriate prefix or non prefix builds: QT_BUILD_DIR, QT_INSTALL_DIR, QT_CONFIG_BUILD_DIR, QT_CONFIG_INSTALL_DIR. These should be used by developers when deciding where files should be placed. All usages of install() are replaced by qt_install(), which has some additional logic on how to handle associationg of CMake targets to export names. When installing files, some consideration should be taken if qt_copy_or_install() needs to be used instead of qt_install(), which takes care of copying files from the source dir to the build dir when doing non-prefix builds. Tested with qtbase and qtsvg, developer builds, non-developer builds and static developer builds on Windows, Linux and macOS. Task-number: QTBUG-75581 Change-Id: I0ed27fb6467662dd24fb23aee6b95dd2c9c4061f Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: Fix up after WrapFreetype introductionTobias Hunger2019-05-081-1/+1
| | | | | Change-Id: I05ca6f8b055f470101ff0dcd1720a349a87e4ba9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Don't link against dbus-1_nolink when dbus_linked feature is offAlexandru Croitor2019-05-081-9/+1
| | | | | | | | | | | | | | | | dbus1_linked is only evaluated to true when the dbus package is found. If it was not found, then it makes no sense to link against the _nolink target, because no package was found in the first place. When the package is not found, QtDBus uses a minimal dbus header which is included with QtDBus sources, so there is no need for the _nolink target. This amends cc141cc5c61d086d6938e2c7312ec02e5f79734c and fixes a build failure on macOS. Change-Id: I71dcbb7465ad13b0bf03579f51412c373125caba Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix freetype target not being found when using vcpkgAlexandru Croitor2019-05-084-8/+8
| | | | | | | | | | vcpkg and upstream CMake find module define different target names for the same package. To circumvent this, create our own Wrap find module, and link against it. Inside the find module, try both target names. Change-Id: Iba488bce0fb410ddb83f6414244f86ad367de72b Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: Regenerate xcb platform pluginTobias Hunger2019-05-071-12/+10
| | | | | | | This contains fixes to the improved library detection recently introduced. Change-Id: I5df03b0c965dd0b8cf4b1769c752ecbb81558265 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Do not require ATSPI2 in platformsupport/linuxaccessibilityTobias Hunger2019-05-071-1/+1
| | | | | Change-Id: I3796ab3eb51306eec67460214c20a3c1c160edee Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix dbus build after dbus library detection updateTobias Hunger2019-05-071-1/+9
| | | | | Change-Id: If4d773136b1aa01204e012c6900458673a4c5670 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix src/plugins/bearerTobias Hunger2019-05-071-1/+1
| | | | | | | Sorry, last-minute-typo hit again:-/ Change-Id: I7130ba3306a96584e2bc33bc1aa27990a3508035 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* Fix special cases in corelibAlexandru Croitor2019-05-061-12/+13
| | | | | Change-Id: I506f379245619c8b5d248ea27dba35a165b455ee Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix special cases in guiAlexandru Croitor2019-05-061-18/+26
| | | | | Change-Id: I9553f1443a772c45748fafca079eaad2bf8cf1de Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 09:26:19 +0000