HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2687:fd75a272a8eb

Fix Creator generated files...

Titta Heikkala -

r2687:fd75a272a8eb

parent child

Context file:

r2687:fd75a272a8eb

Collapse all files

demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.cpp +22 -5

-            // checksum 0x56a9 version 0x80001
+            // checksum 0xc01f version 0x90005
             /*
               This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
               QtQuick2ApplicationViewer is a convenience class containing mobile device specific
             QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path)
             {
-            #if defined(Q_OS_MAC)
+            #if defined(Q_OS_IOS)
+                if (!QDir::isAbsolutePath(path))
+                    return QString::fromLatin1("%1/%2")
+                            .arg(QCoreApplication::applicationDirPath(), path);
+            #elif defined(Q_OS_MAC)
                 if (!QDir::isAbsolutePath(path))
                     return QString::fromLatin1("%1/../Resources/%2")
                             .arg(QCoreApplication::applicationDirPath(), path);
-            #elif defined(Q_OS_UNIX)
+            #elif defined(Q_OS_BLACKBERRY)
-                const QString pathInInstallDir =
+                if (!QDir::isAbsolutePath(path))
+                    return QString::fromLatin1("app/native/%1").arg(path);
+            #elif !defined(Q_OS_ANDROID)
+                QString pathInInstallDir =
                         QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
                 if (QFileInfo(pathInInstallDir).exists())
                     return pathInInstallDir;
+                pathInInstallDir =
+                        QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
+                if (QFileInfo(pathInInstallDir).exists())
+                    return pathInInstallDir;
+            #elif defined(Q_OS_ANDROID_NO_SDK)
+                return QLatin1String("/data/user/qt/") + path;
             #endif
                 return path;
             }
             void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file)
             {
                 d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);
+            #if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+                setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
+            #else
                 setSource(QUrl::fromLocalFile(d->mainQmlFile));
+            #endif
             }
             void QtQuick2ApplicationViewer::addImportPath(const QString &path)
             void QtQuick2ApplicationViewer::showExpanded()
             {
-            #if defined(Q_WS_SIMULATOR)
+            #if defined(Q_WS_SIMULATOR) || defined(Q_OS_QNX)
                 showFullScreen();
             #else
                 show();

demos/quick2chart/qtquick2applicationviewer/qtquick2applicationviewer.h +1 -1

-            // checksum 0xfde6 version 0x80001
+            // checksum 0xfde6 version 0x90005
             /*
               This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
               QtQuick2ApplicationViewer is a convenience class containing mobile device specific

demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.cpp +22 -5

-            // checksum 0x56a9 version 0x80001
+            // checksum 0xc01f version 0x90005
             /*
               This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
               QtQuick2ApplicationViewer is a convenience class containing mobile device specific
             QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path)
             {
-            #if defined(Q_OS_MAC)
+            #if defined(Q_OS_IOS)
+                if (!QDir::isAbsolutePath(path))
+                    return QString::fromLatin1("%1/%2")
+                            .arg(QCoreApplication::applicationDirPath(), path);
+            #elif defined(Q_OS_MAC)
                 if (!QDir::isAbsolutePath(path))
                     return QString::fromLatin1("%1/../Resources/%2")
                             .arg(QCoreApplication::applicationDirPath(), path);
-            #elif defined(Q_OS_UNIX)
+            #elif defined(Q_OS_BLACKBERRY)
-                const QString pathInInstallDir =
+                if (!QDir::isAbsolutePath(path))
+                    return QString::fromLatin1("app/native/%1").arg(path);
+            #elif !defined(Q_OS_ANDROID)
+                QString pathInInstallDir =
                         QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
                 if (QFileInfo(pathInInstallDir).exists())
                     return pathInInstallDir;
+                pathInInstallDir =
+                        QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
+                if (QFileInfo(pathInInstallDir).exists())
+                    return pathInInstallDir;
+            #elif defined(Q_OS_ANDROID_NO_SDK)
+                return QLatin1String("/data/user/qt/") + path;
             #endif
                 return path;
             }
             void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file)
             {
                 d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);
+            #if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+                setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
+            #else
                 setSource(QUrl::fromLocalFile(d->mainQmlFile));
+            #endif
             }
             void QtQuick2ApplicationViewer::addImportPath(const QString &path)
             void QtQuick2ApplicationViewer::showExpanded()
             {
-            #if defined(Q_WS_SIMULATOR)
+            #if defined(Q_WS_SIMULATOR) || defined(Q_OS_QNX)
                 showFullScreen();
             #else
                 show();

demos/quick2oscilloscope/qtquick2applicationviewer/qtquick2applicationviewer.h +1 -1

-            // checksum 0xfde6 version 0x80001
+            // checksum 0xfde6 version 0x90005
             /*
               This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
               QtQuick2ApplicationViewer is a convenience class containing mobile device specific

tests/quick2chartproperties/qtquick2applicationviewer/qtquick2applicationviewer.cpp +22 -5

-            // checksum 0x56a9 version 0x80001
+            // checksum 0xc01f version 0x90005
             /*
               This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
               QtQuick2ApplicationViewer is a convenience class containing mobile device specific
             QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path)
             {
-            #if defined(Q_OS_MAC)
+            #if defined(Q_OS_IOS)
+                if (!QDir::isAbsolutePath(path))
+                    return QString::fromLatin1("%1/%2")
+                            .arg(QCoreApplication::applicationDirPath(), path);
+            #elif defined(Q_OS_MAC)
                 if (!QDir::isAbsolutePath(path))
                     return QString::fromLatin1("%1/../Resources/%2")
                             .arg(QCoreApplication::applicationDirPath(), path);
-            #elif defined(Q_OS_UNIX)
+            #elif defined(Q_OS_BLACKBERRY)
-                const QString pathInInstallDir =
+                if (!QDir::isAbsolutePath(path))
+                    return QString::fromLatin1("app/native/%1").arg(path);
+            #elif !defined(Q_OS_ANDROID)
+                QString pathInInstallDir =
                         QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
                 if (QFileInfo(pathInInstallDir).exists())
                     return pathInInstallDir;
+                pathInInstallDir =
+                        QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
+                if (QFileInfo(pathInInstallDir).exists())
+                    return pathInInstallDir;
+            #elif defined(Q_OS_ANDROID_NO_SDK)
+                return QLatin1String("/data/user/qt/") + path;
             #endif
                 return path;
             }
             void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file)
             {
                 d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file);
+            #if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+                setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
+            #else
                 setSource(QUrl::fromLocalFile(d->mainQmlFile));
+            #endif
             }
             void QtQuick2ApplicationViewer::addImportPath(const QString &path)
             void QtQuick2ApplicationViewer::showExpanded()
             {
-            #if defined(Q_WS_SIMULATOR)
+            #if defined(Q_WS_SIMULATOR) || defined(Q_OS_QNX)
                 showFullScreen();
             #else
                 show();

tests/quick2chartproperties/qtquick2applicationviewer/qtquick2applicationviewer.h +1 -1

-            // checksum 0xfde6 version 0x80001
+            // checksum 0xfde6 version 0x90005
             /*
               This file was generated by the Qt Quick 2 Application wizard of Qt Creator.
               QtQuick2ApplicationViewer is a convenience class containing mobile device specific

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages