diff options
| author | aavit <qt_aavit@ovi.com> | 2011-12-07 13:56:36 (GMT) |
|---|---|---|
| committer | aavit <qt_aavit@ovi.com> | 2011-12-07 13:56:36 (GMT) |
| commit | c220a5dd48d440256a1c9cd73221931f6d99dea5 (patch) | |
| tree | 978d3c5a50d03c98efde6e333c0156cb31d75a43 /demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp | |
| parent | 8762666d8b6854089ea35bb61ced690cdd59791c (diff) | |
| parent | 8a390046adddb8df3ddcf3a421f6f547e6cfe7aa (diff) | |
| download | Qt-c220a5dd48d440256a1c9cd73221931f6d99dea5.zip Qt-c220a5dd48d440256a1c9cd73221931f6d99dea5.tar.gz Qt-c220a5dd48d440256a1c9cd73221931f6d99dea5.tar.bz2 | |
Merge remote-tracking branch 'qt-mainline/4.8'
Diffstat (limited to 'demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp')
| -rw-r--r-- | demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp index 24f0659..4ad31c3 100644 --- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -90,7 +90,6 @@ class QmlApplicationViewerPrivate QString QmlApplicationViewerPrivate::adjustPath(const QString &path) { -#ifdef Q_OS_UNIX #ifdef Q_OS_MAC if (!QDir::isAbsolutePath(path)) return QString::fromLatin1("%1/../Resources/%2") @@ -101,7 +100,6 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path) if (QFileInfo(pathInInstallDir).exists()) return pathInInstallDir; #endif -#endif return path; } |