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
27432d40
Commit
27432d40
authored
8 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I2bd2e61bae1eab4fc74fa6accd741ed9ae1f0669
parents
071a1204
10ecbc40
No related merge requests found
Changes
42
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
mkspecs/common/solaris.conf
+33
-0
mkspecs/common/solaris.conf
mkspecs/features/moc.prf
+1
-1
mkspecs/features/moc.prf
mkspecs/features/qt_configure.prf
+3
-2
mkspecs/features/qt_configure.prf
mkspecs/solaris-g++-64/qmake.conf
+12
-78
mkspecs/solaris-g++-64/qmake.conf
mkspecs/solaris-g++/qmake.conf
+9
-61
mkspecs/solaris-g++/qmake.conf
qmake/Makefile.unix
+2
-5
qmake/Makefile.unix
qmake/Makefile.win32
+0
-1
qmake/Makefile.win32
qmake/qmake.pri
+0
-1
qmake/qmake.pri
src/corelib/global/qconfig-bootstrapped.h
+1
-0
src/corelib/global/qconfig-bootstrapped.h
src/corelib/global/qglobal.cpp
+4
-1
src/corelib/global/qglobal.cpp
src/corelib/io/qiodevice.cpp
+84
-75
src/corelib/io/qiodevice.cpp
src/corelib/io/qiodevice_p.h
+1
-0
src/corelib/io/qiodevice_p.h
src/corelib/io/qresource.cpp
+18
-4
src/corelib/io/qresource.cpp
src/corelib/kernel/qcoreapplication.cpp
+6
-11
src/corelib/kernel/qcoreapplication.cpp
src/corelib/plugin/qlibrary.cpp
+13
-21
src/corelib/plugin/qlibrary.cpp
src/corelib/thread/qthread_win.cpp
+2
-2
src/corelib/thread/qthread_win.cpp
src/corelib/tools/qsimd_p.h
+31
-1
src/corelib/tools/qsimd_p.h
src/corelib/tools/qvector.qdoc
+0
-0
src/corelib/tools/qvector.qdoc
src/corelib/tools/tools.pri
+0
-1
src/corelib/tools/tools.pri
src/gui/configure.json
+2
-3
src/gui/configure.json
with
222 additions
and
268 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