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
4be807a7
Commit
4be807a7
authored
9 years ago
by
Morten Johan Sørvig
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'gerrit/5.6' into nacl-5.6
parents
0a2535f4
97b448b1
No related merge requests found
Changes
266
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
config.tests/common/atomic64/atomic64.cpp
+1
-1
config.tests/common/atomic64/atomic64.cpp
config.tests/common/c++11/c++11.cpp
+1
-1
config.tests/common/c++11/c++11.cpp
configure
+5
-3
configure
examples/widgets/desktop/systray/doc/src/systray.qdoc
+6
-7
examples/widgets/desktop/systray/doc/src/systray.qdoc
examples/widgets/doc/src/fridgemagnets.qdoc
+2
-0
examples/widgets/doc/src/fridgemagnets.qdoc
examples/widgets/doc/src/systray.qdoc
+0
-179
examples/widgets/doc/src/systray.qdoc
examples/widgets/graphicsview/diagramscene/mainwindow.cpp
+2
-2
examples/widgets/graphicsview/diagramscene/mainwindow.cpp
examples/widgets/tools/codecs/doc/src/codecs.qdoc
+1
-0
examples/widgets/tools/codecs/doc/src/codecs.qdoc
examples/xml/dombookmarks/doc/src/dombookmarks.qdoc
+1
-0
examples/xml/dombookmarks/doc/src/dombookmarks.qdoc
examples/xml/xmlstreamlint/doc/src/xmlstreamlint.qdoc
+2
-0
examples/xml/xmlstreamlint/doc/src/xmlstreamlint.qdoc
mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
+3
-2
.../common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
mkspecs/devices/common/linux_device_pre.conf
+1
-1
mkspecs/devices/common/linux_device_pre.conf
mkspecs/features/ctest_testcase_common.prf
+1
-0
mkspecs/features/ctest_testcase_common.prf
mkspecs/features/qt.prf
+43
-35
mkspecs/features/qt.prf
mkspecs/features/qt_functions.prf
+6
-2
mkspecs/features/qt_functions.prf
mkspecs/features/qt_module.prf
+2
-0
mkspecs/features/qt_module.prf
mkspecs/features/qt_module_pris.prf
+24
-12
mkspecs/features/qt_module_pris.prf
qmake/generators/mac/pbuilder_pbx.cpp
+3
-3
qmake/generators/mac/pbuilder_pbx.cpp
qmake/generators/makefile.cpp
+1
-1
qmake/generators/makefile.cpp
qmake/generators/makefile.h
+4
-0
qmake/generators/makefile.h
with
109 additions
and
249 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
