summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Follow automatic Qt version bump on minor version for QML APIsv5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Alex Blasche2018-09-183-6/+10
| | | | | | Task-number: QTBUG-70264 Change-Id: I6e3ec9e316a51ac8ad46e4c1012eb29a35917ca0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-241-3/+3
|\ | | | | | | Change-Id: Ifa3fc40868d8778b28a87b0ec29e6fb813aba75b
| * Doc: Fix broken code snippets in Getting Started/C++ documentPaul Wicking2018-07-231-3/+3
| | | | | | | | | | | | | | | | Add missing closing parenthesis and missing semi-colon. Task-number: QTBUG-61834 Change-Id: I93ebd776305ce36f244a69d7379f27392c3addbe Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-301-0/+1
|\| | | | | | | Change-Id: Ib4e5825baab99b83835350992139e8eafcaa4b9a
| * Fix shadow build for androidMårten Nordheim2018-06-271-0/+1
| | | | | | | | | | | | | | | | (On Windows at least) the target folder has to exist for the IInAppBillingService.java to be created/touched. Change-Id: I0364012a76019a4db010a7b8a9afe178a80f0e16 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-233-3/+3
|\| | | | | | | Change-Id: I9fd486c8e1fa1f81a679e1e2c83254644c78a84d
| * Doc: Add missing dots (qtpurchasing)Paul Wicking2018-06-193-3/+3
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I5e545bd91a520113f98265860da688c4451ef586 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
|/ | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: If7daf670077691384b92b8768becd45d368c326b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Doc: Fix Q_PROPERTY documentationv5.11.0-beta4v5.11.0-beta3Topi Reinio2018-03-281-1/+1
| | | | | | | | | | Clang gets confused about the space between a type name and a pointer qualifier in a Q_PROPERTY macro. Removing the space fixes the related documentation warnings. Change-Id: If2ad8191bb7d0f83be78e927c385442323b3f585 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-202-2/+7
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If0d163e84e99eb29b55a341df2dee59c46561adb
| * Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-182-2/+7
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If135b3be3bfe1d9c44c44dad9f006161a6c7dc19
| | * winrt: React on failure in LoadListingInformationAsyncOliver Wolff2017-11-211-1/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-64549 Change-Id: I8e509674fcca4ba22b734663590b521c59ae7f7e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * Fix the build on tvOS due to an availability declaration bugJake Petroules2017-11-171-1/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-64531 Change-Id: Ie52e896d9f6b57be5ce3e2ec8e5d2bcd05f8575e Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-202-11/+25
|\| | | | | | | | | | | Change-Id: I8941064bdfa99f97e22ad3ad0cc9003d8348b415
| * | Android: More informative error string in some casesv5.10.0-beta3Nuno Santos2017-10-192-11/+25
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices will fail synchronously when trying to create the buy intent, instead of calling handleActivityResult() with the result. When trying to purchase an item already owned by the user on a such device, you would get a purchase failed signal with a very generic error string, as we assumed this could only be caused by a system error. This patch improves the error message by including a description of the response code in the cases where the system returns something usable here. [ChangeLog][Android] Added more informative error messages when the purchasing subsystem was unable to create the buy intent. Task-number: QTBUG-57700 Change-Id: I6328b38b33edf4c1c53d2465bf2205c970bf7e78 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-264-4/+4
| | | | | | | | | | Change-Id: I8dd6cb2bdc4d08ece32a3eeecbbd099a61abd9ef Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Android: remove support for local/debug deploymentJake Petroules2017-09-065-66/+59
|/ | | | | | | | | | | | | | This removes the pre-dexed JAR files activated by the absence of the bundled_jar_file CONFIG option, as versions of Android >= 5 no longer support this deployment mechanism. Now, the "bundled" JARs simply become normal JARs containing class files, and are neither activated by a bundled_jar_file CONFIG entry nor do they have a -bundled suffix in the file's base name. Task-number: QTBUG-62995 Change-Id: Iff3e00c9c6cf0f8916a0d3f40f340705ae4e8c20 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* winrt: Use RequestProductPurchaseWithResultsAsync for all purchasesMaurice Kalinowski2017-06-131-27/+2
| | | | | | | | | | | | ICurrentAppSimulatorWithConsumables can also request a purchase for durable products. This simplifies the purchases and also keeps track of the purchase status in a more convenient way. In addition fixes potential crash when invoked via durable purchase. Change-Id: If1b108f149dddbaf63c07fc1613a97e5dd5d8cfe Task-number: QTBUG-60808 Task-number: QTBUG-61019 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* don't create files in source tree during buildOswald Buddenhagen2017-05-291-2/+2
| | | | | | Task-number: QTBUG-61049 Change-Id: I267ef560f69175e4d2ea8e1abadaed4ba3cd1277 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix bundling of module for static buildsv5.9.0-beta4Julian Strobl2017-05-051-0/+8
| | | | | | | | | | | | | | Without this patch the module is not bundled in static builds correctly causing 'module "<QtModule>" is not installed' errors in during runtime. As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)' at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false', which indicates that the module was not registered. Task-number: QTBUG-59559 Change-Id: Ib8dc1fe6a1d16d06e037cfec4310528aef8fd9cb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update FDL license headerKai Koehne2017-04-209-45/+45
| | | | | | | | | | | | | | Fixes licensescanner warnings like License text does not match FDL due to: Mismatch in license text in src/purchasing/doc/src/windowsstore.qdoc Actual: 'and conditions see http://www.qt.io/terms-conditions. For further' Expected: 'and conditions see https://www.qt.io/terms-conditions. For further' License: FDL (/home/kakoehne/dev/qt/5.9/src/qtpurchasing/../qtbase/header.FDL:6) Old license FDL-OLD being used for src/purchasing/doc/src/windowsstore.qdoc. Change-Id: Ibc566d0e6c14e23cddbe17ffcfac078075527a65 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Android: Add code attributionsEskil Abrahamsen Blomfeldt2017-04-205-1/+262
| | | | | | | | | | On Android we have some third party code which is needed for connecting to the Google Play service and verification of the returned pay load. The attributions for this were missing. Task-number: QTBUG-60122 Change-Id: I0ecd5b3f9c4ef946d4b38c20e48b1f68e6f3640c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-182-13/+13
|\ | | | | | | Change-Id: I5205a985d0e700241047918838cca814d10ac1d2
| * Doc: language review Qt Purchasing5.8Nico Vertriest2017-03-092-13/+13
| | | | | | | | | | | | Change-Id: Iab9d13f1abccf0d0b7717360bffbbb60b427a482 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | winrt: Fix Windows Store backendMaurice Kalinowski2017-04-123-17/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of incompatible upstream changes requires to handle a couple of things differently - The operation during a purchase is not cancelled anymore, when the user cancels the purchase. This caused all purchases to succeed from a Qt perspective. - Querying for Product Licenses does not work anymore. Hence, we have to use the information gathered via the listing information and rely on this. - Add some more debug output to verify connection with the Windows Store. - Fulfilling a consumable restores item requires an ID to be successful Task-number: QTBUG-59766 Change-Id: I3ae64ff565a7d51870bce5b0809a579f78c5193e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta1Liang Qi2017-03-103-7/+11
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I59c9a70eba366693053bb684b374cff02650ace0
| * winrt: Fix potential crash when unable to access product typeMaurice Kalinowski2017-02-281-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Using the store listing might not work on Windows Phone 8.1, especially with the Simulator mode. Hence, check whether accessing IProductListingWithConsumable works. GetProductReceiptAsync might be another option on production side, but that does not work with the simulator at all. Change-Id: I1ad9ea3127b54830553917749d1eb0e8524727d6 Task-number: QTBUG-58836 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-freeMarc Mutz2017-01-262-4/+4
| | | | | | | | | | Change-Id: I9e66a55a0574e6d941c8cd2b813a3861db5f372c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Handle additional StoreKit error codesJake Petroules2017-02-241-1/+14
| | | | | | | | | | Change-Id: Id5232b48f4977278610efb8859f07eab730db399 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Make use of Objective-C generics for additional type safetyJake Petroules2017-02-221-6/+6
| | | | | | | | | | Change-Id: I6095fac194d10efcbfd871aa703f1fb766ee0983 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Convert to templated signals and slotsJake Petroules2017-02-222-14/+15
|/ | | | | Change-Id: I1c7fe27767bb210e27f22fd47bfc0d2466e6f794 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Fix typoKavindra Palaraja2017-01-081-1/+1
| | | | | | | | Removed "It's also" that was there for no reason. Task-number: QTBUG-50848 Change-Id: I2beda2a298e999654b5a0dbd93a37ca44f437048 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* winrt: Fix metatype registrationMaurice Kalinowski2016-11-071-1/+1
| | | | | | Change-Id: Iebbd3d23a900c6cf96ff78fe9d880816ae982e9d Task-number: QTBUG-56925 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* winrt: Fix thread affinity for transactionsv5.8.0-beta1Maurice Kalinowski2016-09-212-15/+56
| | | | | | | | | | | Native callbacks do not give any guarantee on the thread it is invoked on. For latest Windows 10 preview builds purchase result callbacks are happening on another thread. This causes problems instantiating a new transaction object. Hence, delay the allocation for the backend thread. Change-Id: I89df5e55de5e7c75cfa36662c330a5cf2434c3d3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* winrt: Add receipt to transactionsMaurice Kalinowski2016-09-213-18/+79
| | | | | | | | | | Store the receipt of a purchase request in the transaction object, enabling user to query it via platform properties. Change-Id: Ib9ffe302c6efd58685fa86d10ba079915371f2d9 Task-number: QTBUG-55564 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Improve robustness of QML plugin loadingSimon Hausmann2016-09-191-1/+1
| | | | | | | | Use a variable that expands to the latest plugin version instead of hard-coding the string. Change-Id: I26dd56d47e5e62cfd0cc11bfcb004b8f71521e3a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* winrt: Fix crash when restoring purchasesMaurice Kalinowski2016-09-171-0/+5
| | | | | | | | | | As "app" specifies a special handler for WinRT, users might not have queried for this product manually before. Hence register the app product and store it internally. Change-Id: I4863a7bf74a177b6cf7977d7728c51ee2d453b7e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge branch '5.7' into 5.8Eskil Abrahamsen Blomfeldt2016-09-083-6/+10
|\ | | | | | | Change-Id: I9aa2fc955e2455c0d05456101055e7159fd40bad
| * Merge branch '5.6' into 5.7Eskil Abrahamsen Blomfeldt2016-09-083-6/+10
| |\ | | | | | | | | | Change-Id: If860250cfc4ae22b880e0faf1886c8a936dac357
| | * Fix mismatched tags (class vs struct) warningsJake Petroules2016-08-172-2/+4
| | | | | | | | | | | | | | | Change-Id: I78d40181790255146598a5049deaa2c996061fe9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| | * Android: Fix test purchases after changes in Google PlayEskil Abrahamsen Blomfeldt2016-07-191-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After June 20th, Google Play no longer generates order IDs for test purchases, causing an exception to occur in Qt Purchasing when making such purchases and preventing the transaction from being communicated to the application. The orderId and timestamp are not technically required information, so in the case where they are not available, we just ignore it and use defaults instead. [ChangeLog][Android] Fixed test purchases after changes in Google Play that removed the order ID for such transactions. Task-number: QTBUG-54518 Change-Id: If8cd8e4dc76329e572556988b3e65485920c4e0d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Disable Apple backend on watchOSv5.8.0-alpha1Jake Petroules2016-08-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The dependent StoreKit framework is not available on that platform. Change-Id: Ic10ce621d3745f72df0594584ad7b4487d46a708 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | | WinRT: Add documentationMaurice Kalinowski2016-07-063-2/+108
| | | | | | | | | | | | | | | | | | | | | Change-Id: Icc549a858b3360c801e89d7fc6f3f51b790b9a26 Task-number: QTBUG-50550 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Add WinRT backendMaurice Kalinowski2016-07-069-0/+1133
|/ / | | | | | | | | | | | | | | [ChangeLog][Purchasing] Added WinRT backend. Task-number: QTBUG-50550 Change-Id: I28eba8b5a57ef89351537b79e59aedd003ab0c1a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-193-5/+5
|\| | | | | | | Change-Id: Iede8709f38e8109aa8fe06313fd9e545ef0c811e
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-131-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Task-number: QTBUG-52953 Change-Id: I0f996b4f0aff10b0a955f3e0717de96838a84532 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-04-122-4/+4
| | | | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I778330b156ed5d087fd5cf72765336770a24fe37 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Fix crash when requerying product before previous completedEskil Abrahamsen Blomfeldt2016-04-291-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | If a product was queried twice in a row, so quickly that the first one was still pending when the second query was made, then we would have unexpected null pointers in the array of identifiers that we pass into Java. This would cause a crash. Instead, we remove all identifiers which are already pending before creating the array so that it will not have any holes. Task-number: QTBUG-52330 Change-Id: I643835ea224dac969d29ad6572f224a068724d41 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Use Android SDK detection feature instead of hardcodingEskil Abrahamsen Blomfeldt2016-04-281-4/+2
| | | | | | | | | | | | | | | | | | To enable building Qt Purchasing with the appropriate API level rather than hardcoding android-10, we use the new android/sdk.prf feature. Change-Id: Ibc361752c7264aef37658ec00f0ae6bcdac2d12f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Remove debug output from Android backendEskil Abrahamsen Blomfeldt2016-04-281-1/+1
| | | | | | | | | | | | | | | | The Android debug output was accidentally enabled when changing the licenses. Change-Id: If9eafe862dc3d1b3f8d6f134e73a1fbbf508749e Reviewed-by: BogDan Vatra <bogdan@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 22:51:12 +0000