summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-12-06 15:21:31 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-12-06 15:21:31 (GMT)
commite1a6e877e5d3acfb29b291e946e836fbe3e25cb9 (patch)
tree5c39f1e55b2e9dfcf3f391776e9a61b21137e0df /examples
parent36ad9f6fe4e5cf41e393dd86b098c887c880dd47 (diff)
parent73ee6ef3119df49c1fcc3c3478c9211379172a9a (diff)
downloadQt-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
Diffstat (limited to 'examples')
-rw-r--r--examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp2
1 files changed, 0 insertions, 2 deletions
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;
}