summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2011-12-06 13:42:51 (GMT)
committerDaniel Molkentin <daniel.molkentin@nokia.com>2011-12-06 15:05:42 (GMT)
commit73ee6ef3119df49c1fcc3c3478c9211379172a9a (patch)
treed044320b22316ae0f1481221038608eaccccc008 /demos
parente7222ce598fc9e027628d2116d7db42d4e7b6570 (diff)
downloadQt-73ee6ef3119df49c1fcc3c3478c9211379172a9a.zip
Qt-73ee6ef3119df49c1fcc3c3478c9211379172a9a.tar.gz
Qt-73ee6ef3119df49c1fcc3c3478c9211379172a9a.tar.bz2
Fix declarative examples and demos issue on Windows
On Windows, if the resulting binaries reside in /Delease and /Debug subdirs. Thus we require the same hack as on Meego where the binary alone resides in the /bin subdir. Reviewed-by: Alessandro Portale
Diffstat (limited to 'demos')
-rw-r--r--demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp2
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;
}