← Back to branch summary

~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-11-15 12:25:23 UTC
  • mfrom: (1.1.28)
  • Revision ID: timo.jyrinki@canonical.com-20131115122523-i2kyamsu4gs2mu1m
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp
38
38
            QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
39
39
    if (QFileInfo(pathInInstallDir).exists())
40
40
        return pathInInstallDir;
 
41
#elif defined(Q_OS_ANDROID_NO_SDK)
 
42
    return QLatin1String("/data/user/qt/") + path;
41
43
#endif
42
44
    return path;
43
45
}
58
60
void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file)
59
61
{
60
62
    d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);
61
 
#ifdef Q_OS_ANDROID
 
63
#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
62
64
    setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
63
65
#else
64
66
    setSource(QUrl::fromLocalFile(d->mainQmlFile));