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
8ed2fcd3
Commit
8ed2fcd3
authored
9 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge 5.5 into 5.5.1
Change-Id: I3a78e7228aa21b7c83cf7f07dc6e1c8ad0d0ebff
parents
6918c0a1
c12b5e07
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.5
5.6
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/nacl
wip/network-test-server
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
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.5.1
No related merge requests found
Changes
83
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
doc/global/externalsites/qtcreator.qdoc
+28
-16
doc/global/externalsites/qtcreator.qdoc
examples/widgets/desktop/systray/doc/images/systemtray-editor.png
+0
-0
.../widgets/desktop/systray/doc/images/systemtray-editor.png
examples/widgets/desktop/systray/doc/images/systemtray-example.png
+0
-0
...widgets/desktop/systray/doc/images/systemtray-example.png
examples/widgets/desktop/systray/doc/src/systray.qdoc
+183
-0
examples/widgets/desktop/systray/doc/src/systray.qdoc
qmake/doc/src/qmake-manual.qdoc
+1
-2
qmake/doc/src/qmake-manual.qdoc
qmake/generators/win32/msvc_vcproj.cpp
+1
-0
qmake/generators/win32/msvc_vcproj.cpp
src/3rdparty/forkfd/forkfd.c
+1
-1
src/3rdparty/forkfd/forkfd.c
src/3rdparty/forkfd/forkfd.h
+2
-2
src/3rdparty/forkfd/forkfd.h
src/corelib/doc/qtcore.qdocconf
+1
-2
src/corelib/doc/qtcore.qdocconf
src/corelib/doc/src/statemachine.qdoc
+2
-0
src/corelib/doc/src/statemachine.qdoc
src/corelib/global/qnamespace.qdoc
+11
-0
src/corelib/global/qnamespace.qdoc
src/corelib/io/qtextstream.cpp
+1
-1
src/corelib/io/qtextstream.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
+70
-42
src/corelib/kernel/qeventdispatcher_win.cpp
src/corelib/kernel/qeventdispatcher_win_p.h
+10
-1
src/corelib/kernel/qeventdispatcher_win_p.h
src/corelib/kernel/qmetaobject.cpp
+3
-2
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qsocketnotifier.cpp
+0
-36
src/corelib/kernel/qsocketnotifier.cpp
src/corelib/mimetypes/qmimedatabase.cpp
+1
-0
src/corelib/mimetypes/qmimedatabase.cpp
src/corelib/mimetypes/qmimedatabase.h
+1
-0
src/corelib/mimetypes/qmimedatabase.h
src/corelib/mimetypes/qmimedatabase_p.h
+1
-0
src/corelib/mimetypes/qmimedatabase_p.h
src/corelib/mimetypes/qmimemagicrule.cpp
+55
-13
src/corelib/mimetypes/qmimemagicrule.cpp
with
372 additions
and
118 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