Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtBase
Commits
f1ae5ae7
Commit
f1ae5ae7
authored
5 years ago
by
Alexandru Croitor
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
parents
79da236e
3af9d49b
Changes
417
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
CMakeLists.txt
+1
-0
CMakeLists.txt
cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake
+9
-3
...extra-cmake-modules/find-modules/FindWaylandScanner.cmake
cmake/3rdparty/kwin/FindLibdrm.cmake
+7
-1
cmake/3rdparty/kwin/FindLibdrm.cmake
cmake/FindWrapDBus1.cmake
+4
-0
cmake/FindWrapDBus1.cmake
cmake/QtBaseGlobalTargets.cmake
+1
-1
cmake/QtBaseGlobalTargets.cmake
cmake/QtBuild.cmake
+55
-184
cmake/QtBuild.cmake
cmake/QtCompilerOptimization.cmake
+1
-1
cmake/QtCompilerOptimization.cmake
cmake/QtModuleConfig.cmake.in
+4
-19
cmake/QtModuleConfig.cmake.in
cmake/QtPostProcess.cmake
+1
-1
cmake/QtPostProcess.cmake
cmake/QtResource.cmake.in
+15
-29
cmake/QtResource.cmake.in
coin/instructions/call_host_cmake.yaml
+24
-0
coin/instructions/call_host_cmake.yaml
coin/instructions/call_target_cmake.yaml
+24
-0
coin/instructions/call_target_cmake.yaml
coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
+81
-0
...ns/cmake_cross_compilation_module_build_instructions.yaml
coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
+29
-0
...ns/cmake_cross_compilation_qtbase_build_instructions.yaml
coin/instructions/coin_module_build_template_v2.yaml
+18
-0
coin/instructions/coin_module_build_template_v2.yaml
coin/instructions/coin_module_test_template_v2.yaml
+16
-0
coin/instructions/coin_module_test_template_v2.yaml
coin/instructions/coin_qtbase_build_template_v2.yaml
+18
-0
coin/instructions/coin_qtbase_build_template_v2.yaml
coin/module_config.yaml
+2
-30
coin/module_config.yaml
doc/CMakeLists.txt
+1
-0
doc/CMakeLists.txt
examples/corelib/ipc/localfortuneclient/CMakeLists.txt
+6
-1
examples/corelib/ipc/localfortuneclient/CMakeLists.txt
with
317 additions
and
270 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
