diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/tools/uic | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/tools/uic')
| -rw-r--r-- | src/tools/uic/qclass_lib_map.h | 1 | ||||
| -rw-r--r-- | src/tools/uic/ui4.cpp | 14 | ||||
| -rw-r--r-- | src/tools/uic/uic.cpp | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 48793e7f09..940017d063 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -322,6 +322,7 @@ QT_CLASS_LIB(QMacCompatGLenum, QtOpenGL, qgl.h) QT_CLASS_LIB(QGLFormat, QtOpenGL, qgl.h) QT_CLASS_LIB(QGLContext, QtOpenGL, qgl.h) QT_CLASS_LIB(QGLWidget, QtOpenGL, qgl.h) +QT_CLASS_LIB(QOpenGLWidget,QtWidgets,qopenglwidget.h) QT_CLASS_LIB(QGLBuffer, QtOpenGL, qglbuffer.h) QT_CLASS_LIB(QGLColormap, QtOpenGL, qglcolormap.h) QT_CLASS_LIB(QGLFramebufferObject, QtOpenGL, qglframebufferobject.h) diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp index 352cd34b68..01b4437db7 100644 --- a/src/tools/uic/ui4.cpp +++ b/src/tools/uic/ui4.cpp @@ -3471,7 +3471,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()); @@ -4845,23 +4845,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")) { @@ -4869,7 +4869,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); diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index e5f092b558..2bee9de1e8 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -211,6 +211,7 @@ bool Uic::write(QIODevice *in) #ifdef QT_UIC_JAVA_GENERATOR if (language.toLower() != QLatin1String("jambi")) { fprintf(stderr, "uic: File is not a 'jambi' form\n"); + delete ui; return false; } rtn = jwrite (ui); @@ -221,6 +222,7 @@ bool Uic::write(QIODevice *in) #ifdef QT_UIC_CPP_GENERATOR if (!language.isEmpty() && language.toLower() != QLatin1String("c++")) { fprintf(stderr, "uic: File is not a 'c++' ui file, language=%s\n", qPrintable(language)); + delete ui; return false; } |