diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:04 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:04 +0200 |
| commit | 789dc1666188596893cec847e3e5d864ea407ff1 (patch) | |
| tree | 79f21df25a0e34eeb48b5aca3e72b4773c4a9509 | |
| parent | 394461d1f419befc38ba569b2d92782903e72fdc (diff) | |
| parent | 9e1a5ea738c1c9ade78bd0dee4a49e767a674fa1 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I9fd486c8e1fa1f81a679e1e2c83254644c78a84d
| -rw-r--r-- | dist/changes-5.11.1 | 24 | ||||
| -rw-r--r-- | src/purchasing/inapppurchase/qinappproduct.cpp | 2 | ||||
| -rw-r--r-- | src/purchasing/inapppurchase/qinappstore.cpp | 2 | ||||
| -rw-r--r-- | src/purchasing/inapppurchase/qinapptransaction.cpp | 2 |
4 files changed, 27 insertions, 3 deletions
diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1 new file mode 100644 index 0000000..030ea3f --- /dev/null +++ b/dist/changes-5.11.1 @@ -0,0 +1,24 @@ +Qt 5.11.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.11.1 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/purchasing/inapppurchase/qinappproduct.cpp b/src/purchasing/inapppurchase/qinappproduct.cpp index 4556d24..1cc953b 100644 --- a/src/purchasing/inapppurchase/qinappproduct.cpp +++ b/src/purchasing/inapppurchase/qinappproduct.cpp @@ -52,7 +52,7 @@ public: /*! \class QInAppProduct \inmodule QtPurchasing - \brief A product registered in the store + \brief A product registered in the store. QInAppProduct encapsulates a product in the external store after it has been registered in \c QInAppStore and confirmed to exist. It has an identifier which matches the identifier of the product in the external diff --git a/src/purchasing/inapppurchase/qinappstore.cpp b/src/purchasing/inapppurchase/qinappstore.cpp index 658e4b1..4352d11 100644 --- a/src/purchasing/inapppurchase/qinappstore.cpp +++ b/src/purchasing/inapppurchase/qinappstore.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \class QInAppStore \inmodule QtPurchasing - \brief The main entry point for managing in-app purchases + \brief The main entry point for managing in-app purchases. QInAppStore is used for managing in-app purchases in your application in a cross-platform way. diff --git a/src/purchasing/inapppurchase/qinapptransaction.cpp b/src/purchasing/inapppurchase/qinapptransaction.cpp index b515056..faa9103 100644 --- a/src/purchasing/inapppurchase/qinapptransaction.cpp +++ b/src/purchasing/inapppurchase/qinapptransaction.cpp @@ -66,7 +66,7 @@ public: /*! \class QInAppTransaction \inmodule QtPurchasing - \brief Contains information about a transaction in the external app store + \brief Contains information about a transaction in the external app store. QInAppTransaction contains information about a transaction in the external app store and is usually provided as a result of calling QInAppProduct::purchase(). When the purchase flow has |