diff --git a/examples/demos/coffee/coffee.pro b/examples/demos/coffee/coffee.pro index 0c9dce00bb23001a003b3511f1c40bcd2f0709ce..369b8be4e79a9e4d240d2ba11ac24b865eb4b848 100644 --- a/examples/demos/coffee/coffee.pro +++ b/examples/demos/coffee/coffee.pro @@ -23,9 +23,8 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -# Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin +else: win32|if(unix:!android): target.path = $$[QT_INSTALL_EXAMPLES]/demos/$${TARGET} !isEmpty(target.path): INSTALLS += target DISTFILES += \ diff --git a/examples/demos/demos.pro b/examples/demos/demos.pro new file mode 100644 index 0000000000000000000000000000000000000000..ded286f0ea52890151b9326481e22bcc4749b34a --- /dev/null +++ b/examples/demos/demos.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs + +qtHaveModule(quick) { + SUBDIRS += coffee +} + diff --git a/examples/examples.pro b/examples/examples.pro new file mode 100644 index 0000000000000000000000000000000000000000..e959b132db015559cc71717b1bef50d02bdde461 --- /dev/null +++ b/examples/examples.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS = demos + diff --git a/qtdoc.pro b/qtdoc.pro index d001244237035e8cf95a934fe18000adad145d09..14c8c21de86196c9951eed11f4ec1077ec729b16 100644 --- a/qtdoc.pro +++ b/qtdoc.pro @@ -1,2 +1,3 @@ -TEMPLATE = subdirs -SUBDIRS = doc +load(qt_parts) + +SUBDIRS += doc