diff options
6 files changed, 12 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf index ccd239ad..35f43d51 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.4.1 +MODULE_VERSION = 5.4.2 diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp index 58e36ada..73738375 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp +++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char* argv[]) //Add the QML snippet into the layout QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl(":layoutitem.qml")); + QDeclarativeComponent c(&engine, QUrl("qrc:layoutitem.qml")); QGraphicsLayoutItem* obj = qobject_cast<QGraphicsLayoutItem*>(c.create()); layout->addItem(obj); diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index e9f2b17e..b334fae0 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -66,7 +66,7 @@ public: hAlignImplicit(true), rightToLeftText(false), selectByMouse(false), canPaste(false), canPasteValid(false), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0), cursorComponent(0), cursor(0), format(QDeclarativeTextEdit::AutoText), document(0), wrapMode(QDeclarativeTextEdit::NoWrap), - mouseSelectionMode(QDeclarativeTextEdit::SelectCharacters), + mouseSelectionMode(QDeclarativeTextEdit::SelectCharacters), lineCount(0), yoff(0) { } diff --git a/tests/auto/declarative/qdeclarativecomponent/data/data.qrc b/tests/auto/declarative/qdeclarativecomponent/data/data.qrc new file mode 100644 index 00000000..f0405f9b --- /dev/null +++ b/tests/auto/declarative/qdeclarativecomponent/data/data.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/"> + <file>createObject.qml</file> + <file>createObjectWithScript.qml</file> + </qresource> +</RCC> diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index da7352e5..270eef36 100644 --- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -7,7 +7,7 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativecomponent.cpp -DEFINES += SRCDIR=\\\"$$PWD\\\" +RESOURCES += data/data.qrc CONFIG += parallel_test diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp index e1cd68d5..27e9634e 100644 --- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp +++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp @@ -87,7 +87,7 @@ void tst_qdeclarativecomponent::loadEmptyUrl() void tst_qdeclarativecomponent::qmlCreateObject() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/createObject.qml")); + QDeclarativeComponent component(&engine, QUrl("qrc:/createObject.qml")); QObject *object = component.create(); QVERIFY(object != 0); @@ -112,7 +112,7 @@ void tst_qdeclarativecomponent::qmlCreateObject() void tst_qdeclarativecomponent::qmlCreateObjectWithProperties() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/createObjectWithScript.qml")); + QDeclarativeComponent component(&engine, QUrl("qrc:/createObjectWithScript.qml")); QVERIFY2(component.errorString().isEmpty(), component.errorString().toUtf8()); QObject *object = component.create(); QVERIFY(object != 0); |