Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
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
QtX11Extras
Commits
c60e5eab
Commit
c60e5eab
authored
10 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ibf8b681e5501561add1a02ba99b82056a4d4b102
parents
c58b4a50
ad22f632
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
LICENSE.GPL
+0
-674
LICENSE.GPL
LICENSE.GPLv2
+292
-0
LICENSE.GPLv2
LICENSE.LGPLv21
+10
-10
LICENSE.LGPLv21
LICENSE.LGPLv3
+173
-0
LICENSE.LGPLv3
src/x11extras/qtx11extrasglobal.h
+10
-18
src/x11extras/qtx11extrasglobal.h
src/x11extras/qx11info_x11.cpp
+11
-19
src/x11extras/qx11info_x11.cpp
src/x11extras/qx11info_x11.h
+11
-19
src/x11extras/qx11info_x11.h
tests/auto/cmake/test_qx11_module/main.cpp
+10
-18
tests/auto/cmake/test_qx11_module/main.cpp
tests/auto/qx11info/tst_qx11info.cpp
+11
-19
tests/auto/qx11info/tst_qx11info.cpp
with
528 additions
and
777 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
Menu
Explore
Projects
Groups
Topics
Snippets