diff options
| author | Svetlana Abramenkova <sabramenkova@luxoft.com> | 2018-08-27 14:51:47 +0300 |
|---|---|---|
| committer | Svetlana Abramenkova <sabramenkova@luxoft.com> | 2018-08-29 08:08:35 +0000 |
| commit | a239d45ce6e185eb0a3b5e947698a8f08e783189 (patch) | |
| tree | 6bf5d7166e65b5126baa3550366ac344c1759495 | |
| parent | e400161c6ec932c180e8b9fe5e5d00a593ee254a (diff) | |
Fix examples installation path
Corrected default examples install path to QT_INSTALL_EXAMPLES
Change-Id: Ibe288fe44e2c424177b35c8fe2ee18ab5a9de4d9
Task-number: AUTOSUITE-561
Reviewed-by: Ilya A, Galkin <igalkin@luxoft.com>
| -rw-r--r-- | doc/installation.qdoc | 2 | ||||
| -rw-r--r-- | examples/examples.pro | 3 | ||||
| -rwxr-xr-x | qmllive.pri | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/doc/installation.qdoc b/doc/installation.qdoc index 2fcb29e..061e514 100644 --- a/doc/installation.qdoc +++ b/doc/installation.qdoc @@ -133,7 +133,7 @@ The following custom qmake variables are recognized: \row \li EXAMPLES_PREFIX \li Installation prefix for examples. Defaults to - \c{$$[QT_INSTALL_LIBS]/qmllive/examples}. + \c{$$[QT_INSTALL_EXAMPLES]/qmllive}. \row \li QMLLIVE_VERSION_EXTRA diff --git a/examples/examples.pro b/examples/examples.pro index 202f1f1..b288ed9 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,2 @@ TEMPLATE = subdirs -SUBDIRS = \ - app \ +SUBDIRS += app diff --git a/qmllive.pri b/qmllive.pri index 6487905..1494509 100755 --- a/qmllive.pri +++ b/qmllive.pri @@ -4,7 +4,7 @@ android|ios|qnx { } isEmpty(PREFIX): PREFIX = $$[QT_INSTALL_PREFIX] -isEmpty(EXAMPLES_PREFIX): EXAMPLES_PREFIX = $$[QT_INSTALL_LIBS]/qmllive/examples +isEmpty(EXAMPLES_PREFIX): EXAMPLES_PREFIX = $$[QT_INSTALL_EXAMPLES]/qmllive VERSIONS = $$split(VERSION, ".") VERSION_MAJOR = $$member(VERSIONS, 0) |