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
6dd3f080
Commit
6dd3f080
authored
10 years ago
by
Jani Heikkinen
Committed by
The Qt Project
10 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4.0" into refs/staging/5.4.0
parents
132650e4
d7a5dc0c
No related merge requests found
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
mkspecs/common/clang.conf
+3
-0
mkspecs/common/clang.conf
mkspecs/unsupported/freebsd-clang/qmake.conf
+1
-1
mkspecs/unsupported/freebsd-clang/qmake.conf
src/corelib/doc/snippets/qstring/main.cpp
+0
-8
src/corelib/doc/snippets/qstring/main.cpp
src/corelib/tools/qstring.cpp
+12
-15
src/corelib/tools/qstring.cpp
src/dbus/qdbusconnection_p.h
+5
-11
src/dbus/qdbusconnection_p.h
src/dbus/qdbusintegrator.cpp
+37
-38
src/dbus/qdbusintegrator.cpp
src/dbus/qdbusthreaddebug_p.h
+3
-7
src/dbus/qdbusthreaddebug_p.h
tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+0
-0
...auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
with
61 additions
and
80 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
