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 <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>

diff --git a/examples/embedded/styledemo/styledemo.pro b/examples/embedded/styledemo/styledemo.pro
index 60700dd..e005a2f 100644 (file)
--- a/examples/embedded/styledemo/styledemo.pro
+++ b/examples/embedded/styledemo/styledemo.pro
@@ -6,12 +6,12 @@ FORMS += stylewidget.ui
 SOURCES += main.cpp stylewidget.cpp
 RESOURCES += styledemo.qrc
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/styledemo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styledemo
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/styledemo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styledemo
 INSTALLS += target sources
 
 symbian {
     TARGET.UID3 = 0xA000A63F
-    CONFIG += qt_demo
+    CONFIG += qt_example
 }

diff --git a/qmake/option.h b/qmake/option.h
index 83e9687..73a3e80 100644 (file)
--- 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 33e5fa5..2431228 100644 (file)
--- 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")

diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 5333b71..88f12ab 100644 (file)
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -297,11 +297,6 @@ QLibraryInfo::location(LibraryLocation loc)
             path = QT_CONFIGURE_EXAMPLES_PATH;
             break;
 #endif
-#ifdef QT_CONFIGURE_DEMOS_PATH
-        case DemosPath:
-            path = QT_CONFIGURE_DEMOS_PATH;
-            break;
-#endif
         default:
             break;
         }
@@ -352,9 +347,6 @@ QLibraryInfo::location(LibraryLocation loc)
         case ExamplesPath:
             key = QLatin1String("Examples");
             break;
-        case DemosPath:
-            key = QLatin1String("Demos");
-            break;
         default:
             break;
         }
@@ -500,7 +492,6 @@ QLibraryInfo::location(LibraryLocation loc)
     \value TranslationsPath The location of translation information for Qt strings.
     \value SettingsPath The location for Qt settings.
     \value ExamplesPath The location for examples upon install.
-    \value DemosPath The location for demos upon install.
 
     \sa location()
 */

diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index 9af53c3..a8fb909 100644 (file)
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -75,7 +75,6 @@ public:
         DataPath,
         TranslationsPath,
         SettingsPath,
-        DemosPath,
         ExamplesPath,
         ImportsPath
     };

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
index 53fa23b..0135a24 100644 (file)
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
@@ -12,8 +12,8 @@ build_all:!build_pass {
 }
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/chip
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_DEMOS]/chip
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip
 INSTALLS += target sources