summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2010-03-10 13:20:28 (GMT)
committermae <qt-info@nokia.com>2010-03-10 17:31:33 (GMT)
commitb8f9d43dc87054f4f0322a2d124beeb7aaf8bb8f (patch)
treebd53e2fc48ab9193e52ec731a9be3ca27f109a17
parent9d472307b5d34bfd0829b5250fcea177e3e28d8c (diff)
downloadQt-b8f9d43dc87054f4f0322a2d124beeb7aaf8bb8f.zip
Qt-b8f9d43dc87054f4f0322a2d124beeb7aaf8bb8f.tar.gz
Qt-b8f9d43dc87054f4f0322a2d124beeb7aaf8bb8f.tar.bz2
when loading debug import plugins on Mac, try with _debug.dylib suffix
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 6325466..62fe5b5 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1844,6 +1844,9 @@ QString QDeclarativeEnginePrivate::resolvePlugin(const QDir &dir, const QString
return resolvePlugin(dir, baseName,
QStringList()
+# ifdef QT_DEBUG
+ << QLatin1String("_debug.dylib") // try a qmake-style debug build first
+# endif
<< QLatin1String(".dylib")
<< QLatin1String(".so")
<< QLatin1String(".bundle"),