Merge branch '5.6' into dev

Change-Id: I53e6923a83b64ae76cd3d8a2ab2e0b711d07b261

7 files changed, 38 insertions, 28 deletions

diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
index 48261b1..17fddf7 100644
--- a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
+++ b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
@@ -123,6 +123,7 @@ public class QtInAppPurchase
     {
 
         Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
+        serviceIntent.setPackage("com.android.vending.billing");
         if (!m_context.getPackageManager().queryIntentServices(serviceIntent, 0).isEmpty()) {
             m_context.bindService(serviceIntent, m_serviceConnection, Context.BIND_AUTO_CREATE);
         } else {
diff --git a/src/purchasing/doc/qtpurchasing.qdocconf b/src/purchasing/doc/qtpurchasing.qdocconf
index f343ffb..118f603 100644
--- a/src/purchasing/doc/qtpurchasing.qdocconf
+++ b/src/purchasing/doc/qtpurchasing.qdocconf
@@ -2,46 +2,55 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                                            = QtPurchasing
 description                                        = Qt Purchasing Reference Documentation
-url                                                = http://doc.qt.io/QtPurchasing/
-version                                            = 1.0.3
+version                                            = $QT_VERSION
 
 qhp.projects                                       = QtPurchasing
 
 qhp.QtPurchasing.file                              = qtpurchasing.qhp
-qhp.QtPurchasing.namespace                         = org.qtproject.qtpurchasing.1.0
+qhp.QtPurchasing.namespace                         = org.qt-project.qtpurchasing.$QT_VERSION_TAG
 qhp.QtPurchasing.virtualFolder                     = qtpurchasing
 qhp.QtPurchasing.indexTitle                        = Qt Purchasing
 qhp.QtPurchasing.indexRoot                         =
-qhp.QtPurchasing.filterAttributes                  = qtpurchasing 1.0 qtrefdoc
-qhp.QtPurchasing.customFilters.Qt.name             = QtPurchasing 1.0
-qhp.QtPurchasing.customFilters.Qt.filterAttributes = qtpurchasing 1.0
+qhp.QtPurchasing.filterAttributes                  = qtpurchasing $QT_VERSION qtrefdoc
+qhp.QtPurchasing.customFilters.Qt.name             = QtPurchasing $QT_VERSION
+qhp.QtPurchasing.customFilters.Qt.filterAttributes = qtpurchasing $QT_VERSION
 
 qhp.QtPurchasing.subprojects                       = qmltypes classes examples
+
 qhp.QtPurchasing.subprojects.qmltypes.title        = QML Types
 qhp.QtPurchasing.subprojects.qmltypes.indexTitle   = Qt Purchasing QML Types
 qhp.QtPurchasing.subprojects.qmltypes.selectors    = qmlclass
 qhp.QtPurchasing.subprojects.qmltypes.sortPages    = true
+
 qhp.QtPurchasing.subprojects.classes.title         = C++ Classes
 qhp.QtPurchasing.subprojects.classes.indexTitle    = Qt Purchasing C++ Classes
 qhp.QtPurchasing.subprojects.classes.selectors     = class fake:headerfile
 qhp.QtPurchasing.subprojects.classes.sortPages     = true
+
 qhp.QtPurchasing.subprojects.examples.title        = Examples
 qhp.QtPurchasing.subprojects.examples.indexTitle   = Qt Purchasing Examples
 qhp.QtPurchasing.subprojects.examples.selectors    = fake:example
+qhp.QtPurchasing.subprojects.examples.sortPages    = true
+
+depends     += qtcore qtqml qtquick qtdoc qtquickcontrols
+
+headerdirs  += \
+               .. \
+               ../../imports/purchasing
+
+sourcedirs  += \
+               .. \
+               ../../imports/purchasing
+
+exampledirs += \
+               ../../../examples/purchasing
 
-indexes +=  $QT_INSTALL_DOCS/qtqml/qtqml.index \
-            $QT_INSTALL_DOCS/qtquick/qtquick.index \
-            $QT_INSTALL_DOCS/qtdoc/qtdoc.index \
-            $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index
+imagedirs   += images
 
-headerdirs += ../ ../../imports/purchasing
-sourcedirs += ../ ../../imports/purchasing
-exampledirs += ../../../examples/purchasing
-imagedirs  += images
+examplesinstallpath = qtpurchasing/purchasing
 
-examplesinstallpath = purchasing
+Cpp.ignoretokens         += Q_PURCHASING_EXPORT
 
 navigation.landingpage    = "Qt Purchasing"
 navigation.qmltypespage   = "Qt Purchasing QML Types"
 navigation.cppclassespage = "Qt Purchasing C++ Classes"
-buildversion              = "Qt Purchasing 1.0"
diff --git a/src/purchasing/doc/src/qtpurchasing-overview.qdoc b/src/purchasing/doc/src/qtpurchasing-overview.qdoc
index 71760d5..19810e4 100644
--- a/src/purchasing/doc/src/qtpurchasing-overview.qdoc
+++ b/src/purchasing/doc/src/qtpurchasing-overview.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-  \page index.html
+  \page qtpurchasing-index.html
   \title Qt Purchasing
   \brief A cross-platform library to facilitate in-app purchases in Qt and Qt Quick application
 
@@ -57,8 +57,8 @@
   query and purchase the products simpler.
 
   \list
-  \li \l{Registering Products in Google Play}.
-  \li \l{Registering Products in App Store}.
+  \li \l{Registering Products in Google Play}
+  \li \l{Registering Products in App Store}
   \endlist
 
   \section2 Writing the Code
diff --git a/src/purchasing/inapppurchase/mac/qmacinapppurchasebackend.mm b/src/purchasing/inapppurchase/mac/qmacinapppurchasebackend.mm
index 4940316..41b419a 100644
--- a/src/purchasing/inapppurchase/mac/qmacinapppurchasebackend.mm
+++ b/src/purchasing/inapppurchase/mac/qmacinapppurchasebackend.mm
@@ -78,7 +78,7 @@
     NSMutableArray *registeredTransactions = [NSMutableArray array];
 
     for (SKPaymentTransaction *transaction in pendingTransactions) {
-        QInAppTransaction::TransactionStatus status = [InAppPurchaseManager statusFromTransaction:transaction];
+        QInAppTransaction::TransactionStatus status = [QT_MANGLE_NAMESPACE(InAppPurchaseManager) statusFromTransaction:transaction];
 
         QMacInAppPurchaseProduct *product = backend->registeredProductForProductId(QString::fromNSString(transaction.payment.productIdentifier));
 
@@ -156,7 +156,7 @@
     Q_UNUSED(queue);
     for (SKPaymentTransaction *transaction in transactions) {
         //Create QMacInAppPurchaseTransaction
-        QInAppTransaction::TransactionStatus status = [InAppPurchaseManager statusFromTransaction:transaction];
+        QInAppTransaction::TransactionStatus status = [QT_MANGLE_NAMESPACE(InAppPurchaseManager) statusFromTransaction:transaction];
 
         if (status == QInAppTransaction::Unknown)
             continue;
@@ -196,7 +196,7 @@ QMacInAppPurchaseBackend::~QMacInAppPurchaseBackend()
 
 void QMacInAppPurchaseBackend::initialize()
 {
-    m_iapManager = [[InAppPurchaseManager alloc] initWithBackend:this];
+    m_iapManager = [[QT_MANGLE_NAMESPACE(InAppPurchaseManager) alloc] initWithBackend:this];
     emit QInAppPurchaseBackend::ready();
 }
 
diff --git a/src/purchasing/inapppurchase/mac/qmacinapppurchasebackend_p.h b/src/purchasing/inapppurchase/mac/qmacinapppurchasebackend_p.h
index 9f772ec..762a242 100644
--- a/src/purchasing/inapppurchase/mac/qmacinapppurchasebackend_p.h
+++ b/src/purchasing/inapppurchase/mac/qmacinapppurchasebackend_p.h
@@ -82,6 +82,6 @@ private slots:
     void setParentToBackend(QObject *object);
 };
 
-#endif // QMACINAPPPURCHASEBACKEND_P_H
-
 QT_END_NAMESPACE
+
+#endif // QMACINAPPPURCHASEBACKEND_P_H
diff --git a/src/purchasing/inapppurchase/mac/qmacinapppurchaseproduct_p.h b/src/purchasing/inapppurchase/mac/qmacinapppurchaseproduct_p.h
index 3d838f0..2d295c3 100644
--- a/src/purchasing/inapppurchase/mac/qmacinapppurchaseproduct_p.h
+++ b/src/purchasing/inapppurchase/mac/qmacinapppurchaseproduct_p.h
@@ -61,8 +61,8 @@ private:
     SKProduct *m_nativeProduct;
 };
 
-Q_DECLARE_METATYPE(QMacInAppPurchaseProduct*)
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QMacInAppPurchaseProduct*)
+
 #endif // QMACINAPPPURCHASEPRODUCT_P_H
diff --git a/src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction_p.h b/src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction_p.h
index 6e905e9..9afe587 100644
--- a/src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction_p.h
+++ b/src/purchasing/inapppurchase/mac/qmacinapppurchasetransaction_p.h
@@ -70,8 +70,8 @@ private:
     FailureReason m_failureReason;
 };
 
-Q_DECLARE_METATYPE(QMacInAppPurchaseTransaction*)
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QMacInAppPurchaseTransaction*)
+
 #endif // QMACINAPPTRANSACTION_P_H