summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-20 14:39:49 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-20 15:32:41 +0200
commitc3ca73187ea8832428642b3d98bcc52206c5195a (patch)
treefad221c5eb47b12edca28fe6149e1de4607a5d93
parent782710f23604b7437417540c2d44aec06c42f3ba (diff)
Update dependencies
Change-Id: Ie4bec0ead0f7dc9c5124e560df82f1b95c0dccb9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--dependencies.yaml2
-rw-r--r--src/activeqt/container/qaxbase.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/dependencies.yaml b/dependencies.yaml
index 566da31..c679587 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,4 +1,4 @@
dependencies:
../qtbase:
- ref: c93b91c766dc02efdb1955fb5a8a937c75108981
+ ref: 2d0a5f7a014d1b84d5701d835aa28f1a047fbff5
required: true
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index c183629..526980c 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -1115,7 +1115,7 @@ long QAxBase::indexOfVerb(const QString &verb) const
*/
bool QAxBase::initialize(IUnknown **ptr)
{
- using QWindowsApplication = QPlatformInterface::Private::QWindowsApplication;
+ using QWindowsApplication = QNativeInterface::Private::QWindowsApplication;
if (*ptr || control().isEmpty())
return false;