1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to QT_INSTALL_DEMOS & DemosPath.

Browse Source 
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>
This commit is contained in:
Casper van Donderen 2011-07-04 10:30:18 +02:00 committed by Qt by Nokia
parent 26a6d3f11b
commit a97d4dcb24
6 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/embedded/styledemo/styledemo.pro
View File

@ -6,12 +6,12 @@ FORMS += stylewidget.ui
SOURCES += main.cpp stylewidget.cpp SOURCES += main.cpp stylewidget.cpp
RESOURCES += styledemo.qrc 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.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 INSTALLS += target sources
symbian { symbian {
TARGET.UID3 = 0xA000A63F TARGET.UID3 = 0xA000A63F
CONFIG += qt_demo CONFIG += qt_example
} }

1
qmake/option.h
View File

@ -219,7 +219,6 @@ public:
DataPath, DataPath,
TranslationsPath, TranslationsPath,
SettingsPath, SettingsPath,
DemosPath,
ExamplesPath, ExamplesPath,
ImportsPath ImportsPath
}; };

2
qmake/property.cpp
View File

@ -104,7 +104,7 @@ QMakeProperty::value(QString v, bool just_check)
else if(v == "QT_INSTALL_EXAMPLES") else if(v == "QT_INSTALL_EXAMPLES")
return QLibraryInfo::location(QLibraryInfo::ExamplesPath); return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
else if(v == "QT_INSTALL_DEMOS") else if(v == "QT_INSTALL_DEMOS")
return QLibraryInfo::location(QLibraryInfo::DemosPath); return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
else if(v == "QMAKE_MKSPECS") else if(v == "QMAKE_MKSPECS")
return qmake_mkspec_paths().join(Option::dirlist_sep); return qmake_mkspec_paths().join(Option::dirlist_sep);
else if(v == "QMAKE_VERSION") else if(v == "QMAKE_VERSION")

9
src/corelib/global/qlibraryinfo.cpp
View File

@ -296,11 +296,6 @@ QLibraryInfo::location(LibraryLocation loc)
case ExamplesPath: case ExamplesPath:
path = QT_CONFIGURE_EXAMPLES_PATH; path = QT_CONFIGURE_EXAMPLES_PATH;
break; break;
#endif
#ifdef QT_CONFIGURE_DEMOS_PATH
case DemosPath:
path = QT_CONFIGURE_DEMOS_PATH;
break;
#endif #endif
default: default:
break; break;
@ -352,9 +347,6 @@ QLibraryInfo::location(LibraryLocation loc)
case ExamplesPath: case ExamplesPath:
key = QLatin1String("Examples"); key = QLatin1String("Examples");
break; break;
case DemosPath:
key = QLatin1String("Demos");
break;
default: default:
break; break;
} }
@ -500,7 +492,6 @@ QLibraryInfo::location(LibraryLocation loc)
\value TranslationsPath The location of translation information for Qt strings. \value TranslationsPath The location of translation information for Qt strings.
\value SettingsPath The location for Qt settings. \value SettingsPath The location for Qt settings.
\value ExamplesPath The location for examples upon install. \value ExamplesPath The location for examples upon install.
\value DemosPath The location for demos upon install.
\sa location() \sa location()
*/ */

1
src/corelib/global/qlibraryinfo.h
View File

@ -75,7 +75,6 @@ public:
DataPath, DataPath,
TranslationsPath, TranslationsPath,
SettingsPath, SettingsPath,
DemosPath,
ExamplesPath, ExamplesPath,
ImportsPath ImportsPath
}; };

4
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
View File

@ -12,8 +12,8 @@ build_all:!build_pass {
} }
# install # 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.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 INSTALLS += target sources