diff options
| -rw-r--r-- | examples/embedded/styledemo/styledemo.pro | 6 | ||||
| -rw-r--r-- | qmake/option.h | 1 | ||||
| -rw-r--r-- | qmake/property.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 9 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 1 | ||||
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro | 4 |
6 files changed, 6 insertions, 17 deletions
diff --git a/examples/embedded/styledemo/styledemo.pro b/examples/embedded/styledemo/styledemo.pro index 60700dd1df..e005a2f3fe 100644 --- 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 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") diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 5333b71d7b..88f12ab1f7 100644 --- 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 9af53c315c..a8fb90968c 100644 --- 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 53fa23b981..0135a24f94 100644 --- 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 |