diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-24 14:01:04 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-27 08:32:24 +0100 |
| commit | 39f3e08dfac48187a79425c6b50e4579fb3eb5cd (patch) | |
| tree | 1d6c8105affcc7bf27f11990729b1546e446e87d | |
| parent | c86b9eff361ef397276203b8f6e7e04e5eafebb3 (diff) | |
Update dependencies
Add missing Q_MOC_INCLUDE and fix QtConcurrent usage.
Change-Id: I1d553144043c3db4d5b61315ce09223dda960e41
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | examples/purchasing/qthangman/hangmangame.cpp | 2 | ||||
| -rw-r--r-- | src/imports/purchasing/qinappproductqmltype_p.h | 2 | ||||
| -rw-r--r-- | src/purchasing/inapppurchase/qinapptransaction.h | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 0325787..6231b56 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtandroidextras: - ref: 806e8d2f0f58ecd42bfd57c471fd38d84f0083c5 + ref: 9af1f49884a523cedb5641081e07adef01259080 required: false ../qtbase: - ref: 089d54f06ff327f5212cb08fdbcb540066357dd5 + ref: c0538d5ff39b086d40fed943729b26aa3d17b602 required: true ../qtdeclarative: - ref: 406f15ce0e2707452462ff73b2d660ece960623f + ref: 620d5d27721f3139537c7f49d1946b9721e25d14 required: false diff --git a/examples/purchasing/qthangman/hangmangame.cpp b/examples/purchasing/qthangman/hangmangame.cpp index 9af8df0..c1c92f5 100644 --- a/examples/purchasing/qthangman/hangmangame.cpp +++ b/examples/purchasing/qthangman/hangmangame.cpp @@ -63,7 +63,7 @@ HangmanGame::HangmanGame(QObject *parent) { connect(this, &HangmanGame::vowelBought, this, &HangmanGame::registerLetterBought); - QtConcurrent::run(this, &HangmanGame::initWordList); + QtConcurrent::run(&HangmanGame::initWordList, this); m_vowelsUnlocked = m_persistentSettings.value("Hangman/vowelsUnlocked", false).toBool(); m_vowelsAvailable = m_persistentSettings.value("Hangman/vowelsAvailable", 0).toInt(); diff --git a/src/imports/purchasing/qinappproductqmltype_p.h b/src/imports/purchasing/qinappproductqmltype_p.h index fe40cdb..9debec1 100644 --- a/src/imports/purchasing/qinappproductqmltype_p.h +++ b/src/imports/purchasing/qinappproductqmltype_p.h @@ -44,6 +44,8 @@ #include <QtQml/qqmlparserstatus.h> #include <QtCore/qobject.h> +Q_MOC_INCLUDE("qinappstoreqmltype_p.h") + QT_BEGIN_NAMESPACE class QInAppTransaction; diff --git a/src/purchasing/inapppurchase/qinapptransaction.h b/src/purchasing/inapppurchase/qinapptransaction.h index 5e1f2b5..70c35dc 100644 --- a/src/purchasing/inapppurchase/qinapptransaction.h +++ b/src/purchasing/inapppurchase/qinapptransaction.h @@ -34,6 +34,8 @@ #include <QtCore/qdatetime.h> #include <QtPurchasing/qtpurchasingglobal.h> +Q_MOC_INCLUDE("QtPurchasing/qinappproduct.h") + QT_BEGIN_NAMESPACE class QInAppProduct; |