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
36c025a8
Commit
36c025a8
authored
8 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge 5.7 into 5.7.0
Change-Id: I416c79d9afde98efc9e78b3a74e17dfbb2409602
parents
d55f2b1f
8e8bd90e
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.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/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
No related merge requests found
Changes
194
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.qmake.conf
+0
-1
.qmake.conf
config.tests/qpa/eglfs-viv/eglfs-viv.cpp
+3
-1
config.tests/qpa/eglfs-viv/eglfs-viv.cpp
config.tests/qpa/kms/kms.pro
+1
-1
config.tests/qpa/kms/kms.pro
config.tests/unix/compile.test
+3
-5
config.tests/unix/compile.test
configure
+38
-11
configure
examples/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro
+3
-0
...les/corelib/mimetypes/mimetypebrowser/mimetypebrowser.pro
examples/widgets/itemviews/dirview/main.cpp
+5
-0
examples/widgets/itemviews/dirview/main.cpp
mkspecs/devices/linux-imx6-g++/qmake.conf
+17
-0
mkspecs/devices/linux-imx6-g++/qmake.conf
mkspecs/features/configure.prf
+1
-3
mkspecs/features/configure.prf
mkspecs/features/lex.prf
+5
-1
mkspecs/features/lex.prf
mkspecs/features/qml_plugin.prf
+1
-2
mkspecs/features/qml_plugin.prf
mkspecs/features/qt_app.prf
+1
-1
mkspecs/features/qt_app.prf
mkspecs/features/qt_build_config.prf
+1
-0
mkspecs/features/qt_build_config.prf
mkspecs/features/qt_example_installs.prf
+14
-0
mkspecs/features/qt_example_installs.prf
mkspecs/features/qt_helper_lib.prf
+2
-2
mkspecs/features/qt_helper_lib.prf
mkspecs/features/qt_module.prf
+2
-3
mkspecs/features/qt_module.prf
mkspecs/features/qt_module_headers.prf
+10
-0
mkspecs/features/qt_module_headers.prf
mkspecs/features/qt_plugin.prf
+2
-3
mkspecs/features/qt_plugin.prf
mkspecs/wince80colibri-armv7-msvc2012/qmake.conf
+1
-0
mkspecs/wince80colibri-armv7-msvc2012/qmake.conf
qmake/generators/win32/msvc_vcproj.cpp
+8
-0
qmake/generators/win32/msvc_vcproj.cpp
with
118 additions
and
34 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