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
QtBase
Commits
d8f41bdc
Commit
d8f41bdc
authored
9 years ago
by
Jędrzej Nowacki
Committed by
The Qt Project
9 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
parents
f7f55c0b
4159ee84
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.7
5.8
5.9
5.9.8
6.0
6.0.0
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
wip/cmake
wip/lite
wip/remac
wip/webassembly
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
No related merge requests found
Changes
790
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
config.tests/qpa/wayland-server/wayland-server.pro
+5
-0
config.tests/qpa/wayland-server/wayland-server.pro
config.tests/qpa/wayland-server/wl.cpp
+4
-17
config.tests/qpa/wayland-server/wl.cpp
config.tests/unix/harfbuzz/harfbuzz.cpp
+1
-1
config.tests/unix/harfbuzz/harfbuzz.cpp
config.tests/unix/ptrsize.test
+0
-37
config.tests/unix/ptrsize.test
config.tests/unix/ptrsize/ptrsizetest.pro
+0
-3
config.tests/unix/ptrsize/ptrsizetest.pro
configure
+26
-13
configure
doc/global/qt-html-templates-offline-simple.qdocconf
+3
-0
doc/global/qt-html-templates-offline-simple.qdocconf
doc/global/template/style/offline-simple.css
+4
-4
doc/global/template/style/offline-simple.css
doc/global/template/style/offline.css
+1
-0
doc/global/template/style/offline.css
examples/sql/books/bookdelegate.cpp
+1
-1
examples/sql/books/bookdelegate.cpp
examples/widgets/desktop/systray/doc/src/systray.qdoc
+5
-1
examples/widgets/desktop/systray/doc/src/systray.qdoc
examples/widgets/desktop/systray/window.cpp
+5
-0
examples/widgets/desktop/systray/window.cpp
examples/widgets/painting/shared/arthurstyle.cpp
+2
-2
examples/widgets/painting/shared/arthurstyle.cpp
mkspecs/features/exclusive_builds.prf
+2
-1
mkspecs/features/exclusive_builds.prf
mkspecs/features/qgltf.prf
+11
-0
mkspecs/features/qgltf.prf
mkspecs/features/qt_module.prf
+2
-2
mkspecs/features/qt_module.prf
qmake/doc/src/qmake-manual.qdoc
+12
-10
qmake/doc/src/qmake-manual.qdoc
qmake/generators/win32/msvc_objectmodel.cpp
+2
-0
qmake/generators/win32/msvc_objectmodel.cpp
qmake/generators/win32/msvc_vcproj.cpp
+7
-6
qmake/generators/win32/msvc_vcproj.cpp
qmake/library/ioutils.cpp
+4
-0
qmake/library/ioutils.cpp
with
97 additions
and
98 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