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
0a2535f4
Commit
0a2535f4
authored
9 years ago
by
Morten Johan Sørvig
Browse files
Options
Download
Plain Diff
Merge commit '
eef77257
' into nacl-5.6
parents
0008bb24
eef77257
wip/nacl
No related merge requests found
Changes
234
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.gitignore
+4
-0
.gitignore
doc/global/externalsites/external-resources.qdoc
+1
-1
doc/global/externalsites/external-resources.qdoc
mkspecs/common/winrt_winphone/qmake.conf
+2
-2
mkspecs/common/winrt_winphone/qmake.conf
mkspecs/common/winrt_winphone/qplatformdefs.h
+0
-10
mkspecs/common/winrt_winphone/qplatformdefs.h
mkspecs/features/android/android.prf
+1
-1
mkspecs/features/android/android.prf
mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in
+2
-2
mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in
mkspecs/features/data/unix/findclasslist.pl
+15
-16
mkspecs/features/data/unix/findclasslist.pl
mkspecs/features/qt.prf
+2
-2
mkspecs/features/qt.prf
mkspecs/features/qt_build_config.prf
+6
-0
mkspecs/features/qt_build_config.prf
mkspecs/features/qt_clear_installs.prf
+12
-0
mkspecs/features/qt_clear_installs.prf
mkspecs/features/qt_docs.prf
+22
-15
mkspecs/features/qt_docs.prf
mkspecs/features/qt_docs_targets.prf
+10
-10
mkspecs/features/qt_docs_targets.prf
mkspecs/features/qt_functions.prf
+61
-16
mkspecs/features/qt_functions.prf
mkspecs/features/qt_module.prf
+21
-20
mkspecs/features/qt_module.prf
mkspecs/features/qt_module_headers.prf
+60
-2
mkspecs/features/qt_module_headers.prf
mkspecs/features/qt_module_pris.prf
+11
-31
mkspecs/features/qt_module_pris.prf
mkspecs/features/qt_tool.prf
+2
-0
mkspecs/features/qt_tool.prf
mkspecs/features/testcase.prf
+5
-4
mkspecs/features/testcase.prf
mkspecs/features/win32/idcidl.prf
+1
-1
mkspecs/features/win32/idcidl.prf
mkspecs/features/win32/windows.prf
+1
-1
mkspecs/features/win32/windows.prf
with
239 additions
and
134 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