diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:16:44 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:16:44 +0100 |
commit | 2733c790d368c0c53e1471f6a60dbed25e797b5b (patch) | |
tree | ec820b2a440801eb098234b488fb0673f563b7c8 | |
parent | d099a75653713e79318d538ef32d49f989d5e74c (diff) | |
parent | 960afee2cf5041d873f596e91eeafb42d3144e98 (diff) | |
download | qtquick1-2733c790d368c0c53e1471f6a60dbed25e797b5b.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I6556b93b0897a2df48a68238b8ab150541fcbb3f
28 files changed, 36 insertions, 32 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 7a8a32f1..476ef8db 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -17,7 +17,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 exists("qdeclarative_enable_gcov") { QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors - LIBS += -lgcov + LIBS_PRIVATE += -lgcov } #modules diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml index 70b2bfd8..3fc7a0e5 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlMixedPluginType 1.5 +import org.qtproject.AutoTestQmlMixedPluginType 1.5 import QtQuick 1.0 Item { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml index da6ff465..335cc37b 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlMixedPluginType 1.0 +import org.qtproject.AutoTestQmlMixedPluginType 1.0 import QtQuick 1.0 Item { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/incorrectCase.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/incorrectCase.qml index a21ece70..86504269 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/incorrectCase.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/incorrectCase.qml @@ -1,4 +1,4 @@ -import com.nokia.WrongCase 1.0 +import org.qtproject.WrongCase 1.0 MyPluginType { value: 123 } diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml index a9e28e5d..237c49d8 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml @@ -1,3 +1,3 @@ -import com.nokia.AutoTestPluginWithQmlFile 1.0 +import org.qtproject.AutoTestPluginWithQmlFile 1.0 MyQmlFile {} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt index a40c1c82..8790d4e5 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt @@ -1 +1 @@ -1:1:module "com.nokia.AutoTestQmlVersionPluginType" version 1.9 is not installed +1:1:module "org.qtproject.AutoTestQmlVersionPluginType" version 1.9 is not installed diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml index 59fd084a..e6e8da32 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlVersionPluginType 1.9 +import org.qtproject.AutoTestQmlVersionPluginType 1.9 import QtQuick 1.0 QtObject { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt index 2634223d..f6b502e9 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt @@ -1 +1 @@ -1:1:module "com.nokia.AutoTestQmlVersionPluginType" version 1.1 is not installed +1:1:module "org.qtproject.AutoTestQmlVersionPluginType" version 1.1 is not installed diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml index 2065c071..8f2dac41 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlVersionPluginType 1.1 +import org.qtproject.AutoTestQmlVersionPluginType 1.1 import QtQuick 1.0 QtObject { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/works.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/works.qml index f29ae24e..58f5212b 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/works.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/works.qml @@ -1,3 +1,3 @@ -import com.nokia.AutoTestQmlPluginType 1.0 +import org.qtproject.AutoTestQmlPluginType 1.0 MyPluginType { value: 123 } diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml index cc322bf2..c3a21e0d 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml @@ -1,3 +1,3 @@ -import com.nokia.AutoTestQmlPluginType 2.0 +import org.qtproject.AutoTestQmlPluginType 2.0 MyPluginType { valueOnlyIn2: 123 } diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml index c08160ac..939cea8b 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml +++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml @@ -1,3 +1,3 @@ -import com.nokia.AutoTestQmlPluginType 2.1 +import org.qtproject.AutoTestQmlPluginType 2.1 MyPluginType { valueOnlyIn2: 123 } diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro index 73fe8dcb..82060957 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1 +DESTDIR = ../imports/org/qtproject/AutoTestQmlPluginType.2.1 include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp index 1e896d73..8ffc4d8a 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp @@ -76,7 +76,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlPluginType"); qmlRegisterType<MyPluginType>(uri, 2, 1, "MyPluginType"); } }; diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro index ee453f63..d9b17145 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2 +DESTDIR = ../imports/org/qtproject/AutoTestQmlPluginType.2 include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp index 487bc61d..45ba012d 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp @@ -76,7 +76,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlPluginType"); qmlRegisterType<MyPluginType>(uri, 2, 0, "MyPluginType"); } }; diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp index e5581935..7ae2578a 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp @@ -75,7 +75,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlPluginType"); qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro index 15e71ee8..9a5af607 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType +DESTDIR = ../imports/org/qtproject/AutoTestQmlPluginType include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp index ed32add8..1c0faf88 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp @@ -65,7 +65,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlMixedPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlMixedPluginType"); qmlRegisterType<BarPluginType>(uri, 1, 0, "Bar"); } }; diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro index 9e5d8a1f..76a27bdd 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType +DESTDIR = ../imports/org/qtproject/AutoTestQmlMixedPluginType include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp index 5efe0002..aa0bed80 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp @@ -65,7 +65,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlVersionPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlVersionPluginType"); qmlRegisterType<FloorPluginType>(uri, 1, 4, "Floor"); } }; diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro index a688df46..6440a0f8 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType +DESTDIR = ../imports/org/qtproject/AutoTestQmlVersionPluginType include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp index 927f5f01..6cc35f43 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp @@ -51,7 +51,7 @@ class MyPlugin : public QDeclarativeExtensionPlugin public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestPluginWithQmlFile"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestPluginWithQmlFile"); } }; diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro index 57e22835..8779c5d2 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core declarative -DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile +DESTDIR = ../imports/org/qtproject/AutoTestPluginWithQmlFile include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp index 50e43842..ce3da624 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp @@ -75,7 +75,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.WrongCase"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.WrongCase"); qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro index 202d4903..95eb20b3 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro @@ -3,7 +3,7 @@ CONFIG += plugin SOURCES = plugin.cpp QT = core declarative TARGET = Plugin -DESTDIR = ../imports/com/nokia/WrongCase +DESTDIR = ../imports/org/qtproject/WrongCase include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro index f5400602..80679ca8 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core declarative -DESTDIR = ../imports/com/nokia/PureQmlModule +DESTDIR = ../imports/org/qtproject/PureQmlModule include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index f541f8f1..8c1cd6af 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -167,15 +167,19 @@ void tst_qdeclarativemoduleplugin::incorrectPluginCase() QList<QDeclarativeError> errors = component.errors(); QCOMPARE(errors.count(), 1); + QString expectedError = QLatin1String("module \"org.qtproject.WrongCase\" plugin \"PluGin\" not found"); + #if defined(Q_OS_MAC) || defined(Q_OS_WIN32) + bool caseSensitive = true; #if defined(Q_OS_MAC) + caseSensitive = pathconf(QDir::currentPath().toLatin1().constData(), _PC_CASE_SENSITIVE); QString libname = "libPluGin.dylib"; #elif defined(Q_OS_WIN32) + caseSensitive = false; QString libname = "PluGin.dll"; #endif - QString expectedError = QLatin1String("plugin cannot be loaded for module \"com.nokia.WrongCase\": File name case mismatch for \"") + QFileInfo(__FILE__).absoluteDir().filePath("imports/com/nokia/WrongCase/" + libname) + QLatin1String("\""); -#else - QString expectedError = QLatin1String("module \"com.nokia.WrongCase\" plugin \"PluGin\" not found"); + if (!caseSensitive) + expectedError = QLatin1String("plugin cannot be loaded for module \"org.qtproject.WrongCase\": File name case mismatch for \"") + QDir(importsDirectory()).filePath("org/qtproject/WrongCase/" + libname) + QLatin1String("\""); #endif QCOMPARE(errors.at(0).description(), expectedError); @@ -212,7 +216,7 @@ void tst_qdeclarativemoduleplugin::remoteImportWithQuotedUrl() QDeclarativeEngine engine; QDeclarativeComponent component(&engine); - component.setData("import \"http://127.0.0.1:14450/com/nokia/PureQmlModule\" \nComponentA { width: 300; ComponentB{} }", QUrl()); + component.setData("import \"http://127.0.0.1:14450/org/qtproject/PureQmlModule\" \nComponentA { width: 300; ComponentB{} }", QUrl()); QTRY_COMPARE(component.status(), QDeclarativeComponent::Ready); QObject *object = component.create(); @@ -234,7 +238,7 @@ void tst_qdeclarativemoduleplugin::remoteImportWithUnquotedUri() QDeclarativeEngine engine; engine.addImportPath(importsDirectory()); QDeclarativeComponent component(&engine); - component.setData("import com.nokia.PureQmlModule 1.0 \nComponentA { width: 300; ComponentB{} }", QUrl()); + component.setData("import org.qtproject.PureQmlModule 1.0 \nComponentA { width: 300; ComponentB{} }", QUrl()); QTRY_COMPARE(component.status(), QDeclarativeComponent::Ready); |