diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-12-24 15:00:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-24 15:01:46 +0100 |
| commit | 022d6294cb50c832d054408ea5429aaa2de0b55b (patch) | |
| tree | bdea5a3fea0936214df5fc5835804dcffc0b7f7c /src/activeqt/container/qaxbase.cpp | |
| parent | 607f693080fdc256895ab2daaf84a1aa4553e001 (diff) | |
| download | qtactiveqt-022d6294cb50c832d054408ea5429aaa2de0b55b.tar.gz | |
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>
Diffstat (limited to 'src/activeqt/container/qaxbase.cpp')
| -rw-r--r-- | src/activeqt/container/qaxbase.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 89f6201..0d5ab65 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; |