From 262f53210fdeed1ceeda96156dce18e589259f41 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Wed, 1 Aug 2012 13:53:10 +0200 Subject: 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 --- src/tools/uic/driver.cpp | 8 ++++++-- 1 file 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())); } -- cgit v1.2.3