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
adf85c09
Commit
adf85c09
authored
8 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge 5.6 into 5.6.1
Change-Id: I22003b840f1a7ac685a1ec3353d7e7dbd84c3953
parents
5dc421ec
6bcd27b9
Changes
88
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
configure
+0
-9
configure
examples/widgets/itemviews/dirview/main.cpp
+5
-0
examples/widgets/itemviews/dirview/main.cpp
src/corelib/global/qglobal.h
+3
-0
src/corelib/global/qglobal.h
src/corelib/io/qstorageinfo_unix.cpp
+40
-26
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/thread/qbasicatomic.h
+2
-2
src/corelib/thread/qbasicatomic.h
src/corelib/tools/qarraydata.cpp
+3
-3
src/corelib/tools/qarraydata.cpp
src/corelib/tools/qarraydata.h
+2
-2
src/corelib/tools/qarraydata.h
src/corelib/tools/qarraydatapointer.h
+1
-1
src/corelib/tools/qarraydatapointer.h
src/corelib/tools/qcontiguouscache.h
+1
-1
src/corelib/tools/qcontiguouscache.h
src/corelib/tools/qhash.h
+1
-1
src/corelib/tools/qhash.h
src/corelib/tools/qlinkedlist.h
+1
-1
src/corelib/tools/qlinkedlist.h
src/corelib/tools/qlist.h
+1
-1
src/corelib/tools/qlist.h
src/corelib/tools/qmap.h
+1
-1
src/corelib/tools/qmap.h
src/corelib/tools/qrefcount.h
+3
-3
src/corelib/tools/qrefcount.h
src/corelib/tools/qset.h
+1
-1
src/corelib/tools/qset.h
src/corelib/tools/qvector.h
+4
-4
src/corelib/tools/qvector.h
src/dbus/qdbusconnection_p.h
+1
-1
src/dbus/qdbusconnection_p.h
src/dbus/qdbusintegrator.cpp
+20
-11
src/dbus/qdbusintegrator.cpp
src/gui/painting/qplatformbackingstore.cpp
+2
-1
src/gui/painting/qplatformbackingstore.cpp
src/gui/painting/qstroker.cpp
+1
-1
src/gui/painting/qstroker.cpp
with
93 additions
and
70 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