Commit a1375102 authored by Joerg Bornemann's avatar Joerg Bornemann Committed by The Qt Project
Browse files

centralize and fixup example sources install targets


This follows suit with aeb036e in qtbase.

Change-Id: I3b93a30194cddd7514f05ce915eecb2e1ed6433c
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: default avatarOliver Wolff <oliver.wolff@digia.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent bbec42c1
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 6.2 6.2.0 6.2.1 6.2.2 old/5.0 old/5.1 old/5.2 stable v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1 v5.1.0-alpha1 v5.0.2 v5.0.1 v5.0.0 v5.0.0-rc2 v5.0.0-rc1
No related merge requests found
Showing with 14 additions and 41 deletions
load(qt_build_config)
CONFIG += qt_example_installs
......@@ -5,11 +5,8 @@ QT += widgets xmlpatterns
RESOURCES += queries.qrc
INCLUDEPATH += ../shared/
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/filetree
sources.files = $$SOURCES $$HEADERS $$RESOURCES forms queries *.pro *.xq *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/filetree
INSTALLS += target sources
target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/filetree
INSTALLS += target
maemo5: CONFIG += qt_example
......
......@@ -6,10 +6,8 @@ RESOURCES = recipes.qrc
SOURCES = main.cpp querymainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
INCLUDEPATH += ../shared/
target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/recipes
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xq *.html forms files
sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/recipes
INSTALLS += target sources
target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/recipes
INSTALLS += target
maemo5: CONFIG += qt_example
......@@ -5,10 +5,8 @@ RESOURCES = schema.qrc
SOURCES = main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
INCLUDEPATH += ../shared/
target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/schema
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xq *.html files
sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/schema
INSTALLS += target sources
target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/schema
INSTALLS += target
maemo5: CONFIG += qt_example
......@@ -3,10 +3,8 @@ HEADERS = mainwindow.h stationdialog.h stationquery.h timequery.h
SOURCES = main.cpp mainwindow.cpp stationdialog.cpp stationquery.cpp timequery.cpp
FORMS = stationdialog.ui
target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/trafficinfo
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/trafficinfo
INSTALLS += target sources
target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/trafficinfo
INSTALLS += target
maemo5: CONFIG += qt_example
......
......@@ -2,8 +2,6 @@ TEMPLATE = subdirs
SUBDIRS += xquery
!contains(QT_CONFIG, no-widgets): SUBDIRS += filetree trafficinfo schema recipes
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns
sources.files = xmlpatterns.pro shared
sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns
INSTALLS += target sources
EXAMPLE_FILES = \
shared
# We don't have any C++ files to build, so in order to trick qmake which
# doesn't understand that, we use the subdirs template, but without specifying
# any subdirs.
TEMPLATE = subdirs
target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery/globalVariables
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.cpp *.pro *.xq *.html globals.gccxml
sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery/globalVariables
INSTALLS += target sources
maemo5: CONFIG += qt_example
TEMPLATE = subdirs
SUBDIRS += globalVariables
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xquery.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery
INSTALLS += target sources
TEMPLATE = aux
EXAMPLE_FILES = globalVariables
maemo5: CONFIG += qt_example
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment