diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2014-10-09 01:38:50 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2014-10-14 17:51:08 +0200 |
| commit | a96a15e40fe3a7b9f27582ae7c370d79bd314d66 (patch) | |
| tree | b351ea01219d6957642765e49740cdf11d673403 | |
| parent | d55407822eefbc05f7d8bb44c53b057332b5b399 (diff) | |
| download | qttools-a96a15e40fe3a7b9f27582ae7c370d79bd314d66.tar.gz | |
generate_ui: adapt to upstream change in qtbase
Change 106487387d493dab934e19b33bfed55b8df62d67 in qtbase
removed a few ? true : false, some of them happened to be
in uic's generated code.
Adapt the generator.
Change-Id: I1c5aefef57e3d17aaef3c1eee4ce92730499b4df
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/designer/data/generate_shared.xsl | 3 | ||||
| -rw-r--r-- | src/designer/src/lib/uilib/ui4.cpp | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/designer/data/generate_shared.xsl b/src/designer/data/generate_shared.xsl index 108fe76de..b2db55536 100644 --- a/src/designer/data/generate_shared.xsl +++ b/src/designer/data/generate_shared.xsl @@ -141,9 +141,8 @@ <xsl:text>.toDouble()</xsl:text> </xsl:when> <xsl:when test="$xs-type='xs:boolean'"> - <xsl:text>(</xsl:text> <xsl:value-of select="$val"/> - <xsl:text> == QStringLiteral("true") ? true : false)</xsl:text> + <xsl:text> == QStringLiteral("true")</xsl:text> </xsl:when> <xsl:when test="$xs-type='xs:long'"> <xsl:value-of select="$val"/> diff --git a/src/designer/src/lib/uilib/ui4.cpp b/src/designer/src/lib/uilib/ui4.cpp index b677a6dac..625b7a6f7 100644 --- a/src/designer/src/lib/uilib/ui4.cpp +++ b/src/designer/src/lib/uilib/ui4.cpp @@ -3474,7 +3474,7 @@ void DomWidget::read(QXmlStreamReader &reader) continue; } if (name == QStringLiteral("native")) { - setAttributeNative((attribute.value().toString() == QStringLiteral("true") ? true : false)); + setAttributeNative(attribute.value().toString() == QStringLiteral("true")); continue; } reader.raiseError(QStringLiteral("Unexpected attribute ") + name.toString()); @@ -4848,23 +4848,23 @@ void DomFont::read(QXmlStreamReader &reader) continue; } if (tag == QStringLiteral("italic")) { - setElementItalic((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementItalic(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("bold")) { - setElementBold((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementBold(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("underline")) { - setElementUnderline((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementUnderline(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("strikeout")) { - setElementStrikeOut((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementStrikeOut(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("antialiasing")) { - setElementAntialiasing((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementAntialiasing(reader.readElementText() == QStringLiteral("true")); continue; } if (tag == QStringLiteral("stylestrategy")) { @@ -4872,7 +4872,7 @@ void DomFont::read(QXmlStreamReader &reader) continue; } if (tag == QStringLiteral("kerning")) { - setElementKerning((reader.readElementText() == QStringLiteral("true") ? true : false)); + setElementKerning(reader.readElementText() == QStringLiteral("true")); continue; } reader.raiseError(QStringLiteral("Unexpected element ") + tag); |