From a97d4dcb24a9fc69ee57c5607005a4e8b85d3b32 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 4 Jul 2011 10:30:18 +0200 Subject: Remove references to QT_INSTALL_DEMOS & DemosPath. The distinction between 'examples' and 'demos' is completely blurred at this point. We've decided, with the SDK people, to scrap the existing terminology in favor of the word 'example' only -- distinguishing between code snippets, walkthroughs, "demonstrations" can be done via keywords or some other method. Removing QT_INSTALL_DEMOS from all .pro files in Qt is still in progress. Change-Id: I86fc0e40d54baa54c5641fc6acbd8b67e4ad2789 Reviewed-on: http://codereview.qt.nokia.com/1034 Reviewed-by: Qt Sanity Bot Reviewed-by: Marius Storm-Olsen --- qmake/option.h | 1 - qmake/property.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'qmake') diff --git a/qmake/option.h b/qmake/option.h index 83e9687cba..73a3e807aa 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -219,7 +219,6 @@ public: DataPath, TranslationsPath, SettingsPath, - DemosPath, ExamplesPath, ImportsPath }; diff --git a/qmake/property.cpp b/qmake/property.cpp index 33e5fa5c0a..24312287a4 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -104,7 +104,7 @@ QMakeProperty::value(QString v, bool just_check) else if(v == "QT_INSTALL_EXAMPLES") return QLibraryInfo::location(QLibraryInfo::ExamplesPath); else if(v == "QT_INSTALL_DEMOS") - return QLibraryInfo::location(QLibraryInfo::DemosPath); + return QLibraryInfo::location(QLibraryInfo::ExamplesPath); else if(v == "QMAKE_MKSPECS") return qmake_mkspec_paths().join(Option::dirlist_sep); else if(v == "QMAKE_VERSION") -- cgit v1.2.3