From 022d6294cb50c832d054408ea5429aaa2de0b55b Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Tue, 24 Dec 2013 15:00:33 +0100
Subject: [PATCH] Prospective build fix on Windows for explicit
QMetaStringTable constructor
See build failure in https://codereview.qt-project.org/#change,74370
Change-Id: I2565614aa76bae8c7dc338cd751337a0bb3f6dce
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
src/activeqt/container/qaxbase.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 89f6201a..0d5ab65e 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -3092,7 +3092,10 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
header->flags = 0;
header->signalCount = signal_list.count();
- QMetaStringTable strings(that ? QByteArray(that->className()) : className);
+ QByteArray classNameForMetaObject = className;
+ if (that)
+ classNameForMetaObject = that->className();
+ QMetaStringTable strings(classNameForMetaObject);
uint offset = header->classInfoData;
--
GitLab