feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
This commit is contained in:
Eike Ziller
2013-04-30 11:43:33 +02:00
parent 3aa0e50039 71f1919de9
commit bedc477943
39 changed files with 267 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -60,7 +60,7 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
if (!QDir::isAbsolutePath(path))
return QString::fromLatin1("%1/../Resources/%2")
.arg(QCoreApplication::applicationDirPath(), path);
#elif defined(Q_OS_QNX)
#elif defined(Q_OS_BLACKBERRY)
if (!QDir::isAbsolutePath(path))
return QString::fromLatin1("app/native/%1").arg(path);
#elif !defined(Q_OS_ANDROID)