summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* CMake: pro2cmake.py: Remove some dead codeTobias Hunger2019-02-111-15/+0
| | | | | Change-Id: I8e3e7e4c4ef9747e0749734bdf875baccc4646bd Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* CMake: pro2cmake.py: Remove leading ./ in pathsTobias Hunger2019-02-111-1/+3
| | | | | | | | Remove leading './' from paths before writing them into CMakeLists.txt. Change-Id: I5680a3470cf491a8805b559197f94f8e6a6ce9b7 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: pro2cmake: Fix handling of chained scopes with else branchesTobias Hunger2019-02-111-1/+28
| | | | | | | | | | | | | | | | Fix handling of things like: foo:bar:buz: { do something } else: wat { do something else } The else relates to foo AND bar AND buz, not just to buz in this case. Change-Id: I40d1fa295b4d6dd95ae5e1ce2d58372edc807b86 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: Map dlopen feature to 'ON'Tobias Hunger2019-02-112-1/+3
| | | | | | | | | | | | Map the dlopen feature to 'ON'. The effect is that cmake will figure out whether or not linking to 'dl' is necessary or not. The user-visible feature is 'library' anyway: That enables dynamic library loading -- and will link in 'dl' as needed. Change-Id: I0d68275a7234efba7f926150f120bb37b4a1163f Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: pro2cmake.py: Add XCB and X11 librariesTobias Hunger2019-02-111-2/+22
| | | | | | | | Add all the XCB and X11 libraries needed for the XCB plugin. Change-Id: I772b99c68521cd46cbba736912c8d8594d9d2ad8 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Fix xcb platform linking when compiling the nativepainting codeAlbert Astals Cid2019-02-111-4/+6
| | | | | Change-Id: I9bc435d27bf4abf1ff4cbfebb981ab701a5d17ec Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Fix xlib compile testAlbert Astals Cid2019-02-111-1/+3
| | | | | Change-Id: Ib7d58484ef2bd0f38d3954940e7e527b4f848c4b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Add devicediscovery and fbconvenienceAlbert Astals Cid2019-02-113-0/+57
| | | | | | | Generated by pro2cmake.py Change-Id: I405430c622824aab9a7bf6839b2271a494856c24 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Allow passing libraries to qt_config_compile_testAlbert Astals Cid2019-02-112-4/+17
| | | | | | | | Fixes cxx11_future and ipc_posix tests Change-Id: I0f3a7b1a0452724c07198a87c2fc25344e7451eb Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: Make sure moc/rcc/uic are built when neededAlbert Astals Cid2019-02-072-0/+5
| | | | | | | | | | | | | This way you can run cmake, go directly into src/widgets and it will build moc and rcc before QtCore (because they are needed there) and uic before QtWidgets but not before QtCore because it's not used there. Without this it would get stuck creating the mocs since cmake is not expecting the moc executable to just not be there Change-Id: Ibcb6057bfab7a4bf823544e8f7bd128ea93d1986 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: Build src/plugins/imageformatsAlbert Astals Cid2019-02-015-0/+60
| | | | | | Change-Id: I4bf09c50eebf71255590e9b17e637ce621d3cd40 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: Fix build of xcb platform plugin when vulkan is availableAlbert Astals Cid2019-02-013-1/+21
| | | | | Change-Id: I79760aa0cb08752cfc20aabc1a890f60c91c9dfd Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: Only use the doubleconversion cmake config if "valid"Albert Astals Cid2019-02-011-1/+3
| | | | | | | | | And by "valid" i mean if it returns the double-conversion::double-conversion target that we are going to use later. Fedora rawhide has a doubleconversion cmake config file but it doesn't define any target Change-Id: Ib0360bc9fdf593a14510c9a2d59b47b32bc4b356 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: glib changed name to glib2Albert Astals Cid2019-02-013-6/+6
| | | | | Change-Id: I4a86bd3b01e1fe307e9802182df943245a7fce4c Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: pro2cmake.py: Small fix to type markupTobias Hunger2019-01-311-1/+1
| | | | | Change-Id: I2f7dc94f379d51c3816649849aa7365b17334ab5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: pro2cmake.py: Add scope debugging supportTobias Hunger2019-01-311-0/+8
| | | | | | | | Dump scope trees for all scopes that contain a variable 'PRO2CMAKE_SCOPE_DEBUG' (set to any value). Change-Id: If17bb1697a32ccaa427a858c2330ab2b019d0fa8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: pro2cmake.py: Assign a unique id to each scopeTobias Hunger2019-01-311-2/+7
| | | | | | | This makes scopes much simpler to destinguish from each other. Change-Id: I1af42f181b5899aba749bcf9267a345385149f90 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: pro2cmake.py: report total condition when dumping a scopeTobias Hunger2019-01-311-0/+2
| | | | | | | Show the total_condition (if set) when dumping a scope. Change-Id: I9dfe98c2251f1d28881771042f17d723cedc8907 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: pro2cmake.py: Add a way to debug merges of scopesTobias Hunger2019-01-311-2/+20
| | | | | | | | Generate debug output whenever a qmake scope with a variable 'PRO2CMAKE_MERGE_DEBUG' is involved in a scope merge. Change-Id: I0ad94b881db9930de689c199adbac084efe6c03b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: pro2cmake.py: Handle more librariesTobias Hunger2019-01-311-1/+9
| | | | | Change-Id: I561b619c4dbc56a1f6ad383a68ce4b82858a031c Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* CMake: Introduce QT_HAS_NAMESPACETobias Hunger2019-01-311-0/+5
| | | | | | | This makes testing for Qt with namespace builds easier in extend_target. Change-Id: I58ab985a2ed39859fb65d35f8f69065fed2a5c9b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: Add FindZSTD.cmake and wire it up in configurejson2cmake.pyTobias Hunger2019-01-312-0/+50
| | | | | | | Zstd is used in the dev branch, so prepare for it. Change-Id: I130d98e3888a1eb4c7444728fc5088c5dae9d911 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: Use FindGLIB2 from cmake-extra-modulesTobias Hunger2019-01-314-5/+104
| | | | | | | Use FindGLIB2 from cmake-extra-modules over hand-rolled own version. Change-Id: I1f8e055bc12dd728c033fd88480690643d90159a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* CMake: Add debugging support for extend_target(...) callsTobias Hunger2019-01-311-0/+9
| | | | | | | | Enable a flag so that cmake documents which extend_target calls it acts upon and which ones are skipped. Change-Id: I1e2d4da47b93d6b5d7b7ec25b7bc6341f38b3dca Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* CMake: pro2cmake.py: Pass QMAKE_MOC_OPTIONS on to CMakeTobias Hunger2019-01-312-1/+13
| | | | | Change-Id: I39c1b0aedbffaa29a34253e0c1c4bb4a4dddbe98 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 09:09:41 +0000