QDebug &operator<< (QDebug &debug, const QQmlDirParser::Component &component)
{
- return debug << qPrintable(QString("{%1 %2.%3}").arg(component.typeName)
- .arg(component.majorVersion)
- .arg(component.minorVersion));
+ const QString output = QString::fromLatin1("{%1 %2.%3}").
+ arg(component.typeName).arg(component.majorVersion).arg(component.minorVersion);
+ return debug << qPrintable(output);
}
QDebug &operator<< (QDebug &debug, const QQmlDirParser::Script &script)
{
- return debug << qPrintable(QString("{%1 %2.%3}").arg(script.nameSpace)
- .arg(script.majorVersion)
- .arg(script.minorVersion));
+ const QString output = QString::fromLatin1("{%1 %2.%3}").
+ arg(script.nameSpace).arg(script.majorVersion).arg(script.minorVersion);
+ return debug << qPrintable(output);
}
QT_END_NAMESPACE
const QVariant &value = cp->propertyValues.at(propertyIdx);
if (value.userType() == qMetaTypeId<QList<QObject*> >()) {
- QQmlListProperty<QObject> prop(context->asQQmlContext(), (void*)propertyIdx,
+ QQmlListProperty<QObject> prop(context->asQQmlContext(), (void*) qintptr(propertyIdx),
0,
QQmlContextPrivate::context_count,
QQmlContextPrivate::context_at);
QTextLine line;
int visibleCount = 0;
bool elide;
- bool widthChanged;
qreal height = 0;
QString elideText;
bool once = true;
bool truncateHeight = false;
truncated = false;
elide = false;
- widthChanged = false;
int characterCount = 0;
int unwrappedLineCount = 1;
int maxLineCount = maximumLineCount();
const qreal oldWidth = lineWidth;
lineWidth = q->widthValid() && q->width() > 0 ? q->width() : FLT_MAX;
- if (lineWidth != oldWidth && (singlelineElide || multilineElide || canWrap || horizontalFit)) {
- widthChanged = true;
+ if (lineWidth != oldWidth && (singlelineElide || multilineElide || canWrap || horizontalFit))
continue;
- }
}
// If the next needs to be elided and there's an abbreviated string available
maybeUpdate(canvas);
}
-void QQuickTrivialWindowManager::exposureChanged(QQuickCanvas *canvas)
+void QQuickTrivialWindowManager::exposureChanged(QQuickCanvas *)
{
}
focusState[item].set(true, true);
focusState.active(item);
FVERIFY();
+ delete child2;
}
}
QQuickView *canvas = QQuickViewTestUtil::createView();
QQmlContext *ctxt = canvas->rootContext();
- ctxt->setContextProperty("enableAddTransition", false);
+ ctxt->setContextProperty("enableAddTransition", QVariant(false));
ctxt->setContextProperty("model_targetItems_transitionFrom", &model_targetItems_transitionFrom);
ctxt->setContextProperty("model_displacedItems_transitionVia", &model_displacedItems_transitionVia);
ctxt->setContextProperty("targetItems_transitionFrom", targetItems_transitionFrom);
const QUrl stringListSource[] = {
testFileUrl("stringlistproperties.qml"),
testFileUrl("stringlistproperties-package.qml") };
- const QUrl objectListSource[] = {
- testFileUrl("objectlistproperties.qml"),
- testFileUrl("objectlistproperties-package.qml") };
for (int i = 0; i < 2; ++i) {
// List Model.