summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-04-01 10:24:10 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2010-04-01 10:24:10 (GMT)
commit89d40b78597aec3ecf39ad8e2dd84427bc48dc73 (patch)
tree000e8a0eb6785cc36db41a1145fa3efe886a6e7f /src
parent95e0fa369685ab86a433ff604b25e34f6aa62d2d (diff)
downloadQt-89d40b78597aec3ecf39ad8e2dd84427bc48dc73.zip
Qt-89d40b78597aec3ecf39ad8e2dd84427bc48dc73.tar.gz
Qt-89d40b78597aec3ecf39ad8e2dd84427bc48dc73.tar.bz2
Fix loading of _debug.dylib plugins under OSX.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 3e570e5..9442705 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1980,8 +1980,11 @@ QString QDeclarativeEnginePrivate::resolvePlugin(const QDir &dir, const QString
QStringList()
# ifdef QT_DEBUG
<< QLatin1String("_debug.dylib") // try a qmake-style debug build first
-# endif
<< QLatin1String(".dylib")
+# else
+ << QLatin1String(".dylib")
+ << QLatin1String("_debug.dylib") // try a qmake-style debug build after
+# endif
<< QLatin1String(".so")
<< QLatin1String(".bundle"),
QLatin1String("lib"));