diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-08-01 13:53:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 15:37:46 +0200 |
| commit | 262f53210fdeed1ceeda96156dce18e589259f41 (patch) | |
| tree | d4f36ea6c311adaea9c64052f8203d3b4977c3d1 | |
| parent | edc6fce47f5bbf0d0c85d2c87efa30d13e8fc903 (diff) | |
Fix crash in uic
Compiling Qt5 uic with Microsoft Visual Studio 2008
with SP1 will lead into a assertion in the copy
constructor of qstring.
This is apparently a compiler Bug.
Change-Id: Ia3353434d00b2e87800b937d891eabef86293751
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/tools/uic/driver.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index ea1d4f21f3..9ef6fcb387 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -69,7 +69,9 @@ QString Driver::findOrInsertWidget(DomWidget *ui_widget) QString Driver::findOrInsertSpacer(DomSpacer *ui_spacer) { if (!m_spacers.contains(ui_spacer)) { - const QString name = ui_spacer->hasAttributeName() ? ui_spacer->attributeName() : QString(); + QString name; + if (ui_spacer->hasAttributeName()) + name = ui_spacer->attributeName(); m_spacers.insert(ui_spacer, unique(name, QLatin1String("QSpacerItem"))); } @@ -79,7 +81,9 @@ QString Driver::findOrInsertSpacer(DomSpacer *ui_spacer) QString Driver::findOrInsertLayout(DomLayout *ui_layout) { if (!m_layouts.contains(ui_layout)) { - const QString name = ui_layout->hasAttributeName() ? ui_layout->attributeName() : QString(); + QString name; + if (ui_layout->hasAttributeName()) + name = ui_layout->attributeName(); m_layouts.insert(ui_layout, unique(name, ui_layout->attributeClass())); } |