Skip to content
GitLab
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
QtPurchasing
Commits
49c5461a
Commit
49c5461a
authored
7 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: .qmake.conf Change-Id: If135b3be3bfe1d9c44c44dad9f006161a6c7dc19
parents
1f9e8a54
34796716
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist/changes-5.9.4
+25
-0
dist/changes-5.9.4
src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction.mm
+2
-1
...chasing/inapppurchase/mac/qmacinapppurchasetransaction.mm
src/purchasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
+5
-1
...hasing/inapppurchase/winrt/qwinrtinapppurchasebackend.cpp
with
32 additions
and
2 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