diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-10 23:00:13 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-10 23:00:13 (GMT) |
| commit | d8b52dac5167bdf498d19d66ccb78fb12badf85a (patch) | |
| tree | d0048967e2089e4893baa4b576d57bfcf24656ca /src/declarative | |
| parent | a18714105029a54b4a3814d8e2e5ac2d45c233e9 (diff) | |
| parent | eabde99a0e9e4c5e49a05187530cf643258d5719 (diff) | |
| download | Qt-d8b52dac5167bdf498d19d66ccb78fb12badf85a.zip Qt-d8b52dac5167bdf498d19d66ccb78fb12badf85a.tar.gz Qt-d8b52dac5167bdf498d19d66ccb78fb12badf85a.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/declarative.pro | 1 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 93ad861..1ad888b 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -2,7 +2,6 @@ TARGET = QtDeclarative QPRO_PWD = $$PWD QT = core gui script network contains(QT_CONFIG, svg): QT += svg -contains(QT_CONFIG, opengl): QT += opengl DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index acc13de..94765f2 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -382,7 +382,13 @@ bool QDeclarativeImportsPrivate::importExtension(const QString &absoluteFilePath foreach (const QDeclarativeDirParser::Plugin &plugin, qmldirParser.plugins()) { QString resolvedFilePath = database->resolvePlugin(dir, plugin.path, plugin.name); - +#if defined(QT_LIBINFIX) && defined(Q_OS_SYMBIAN) + if (resolvedFilePath.isEmpty()) { + // In case of libinfixed build, attempt to load libinfixed version, too. + QString infixedPluginName = plugin.name + QLatin1String(QT_LIBINFIX); + resolvedFilePath = database->resolvePlugin(dir, plugin.path, infixedPluginName); + } +#endif if (!resolvedFilePath.isEmpty()) { if (!database->importPlugin(resolvedFilePath, uri, errorString)) { if (errorString) |