diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-06 15:21:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-06 15:21:31 (GMT) |
| commit | e1a6e877e5d3acfb29b291e946e836fbe3e25cb9 (patch) | |
| tree | 5c39f1e55b2e9dfcf3f391776e9a61b21137e0df | |
| parent | 36ad9f6fe4e5cf41e393dd86b098c887c880dd47 (diff) | |
| parent | 73ee6ef3119df49c1fcc3c3478c9211379172a9a (diff) | |
| download | Qt-e1a6e877e5d3acfb29b291e946e836fbe3e25cb9.zip Qt-e1a6e877e5d3acfb29b291e946e836fbe3e25cb9.tar.gz Qt-e1a6e877e5d3acfb29b291e946e836fbe3e25cb9.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix declarative examples and demos issue on Windows
| -rw-r--r-- | demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp | 2 | ||||
| -rw-r--r-- | examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp | 2 |
2 files changed, 0 insertions, 4 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; } diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp index 24f0659..4ad31c3 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/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; } |