diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2016-12-15 23:46:38 +0200 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2017-01-05 17:50:33 +0000 |
| commit | 9beed8859bcf78f5d4cff04be07f1ef52f266881 (patch) | |
| tree | 2dae82f0743e35e4740b2e81f823382586fb6b70 | |
| parent | c78a96761182b54f40009bfeb9be9bc03b767575 (diff) | |
Fix lipi-toolkit deployment
Lipi-toolkit projects were not deployed in non-prefix builds.
The suspected cause is COPIES directive being ignored in AUX project.
Moved deployment to virtualkeyboard.pro as workaround. This is also
consistent with other deployments.
Change-Id: I82237c1e1e6ee9b001294ff3b22fb5cd013b8105
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
6 files changed, 5 insertions, 31 deletions
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/lipi-toolkit.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/lipi-toolkit.pro index bd678b99..9593051a 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/lipi-toolkit.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/lipi-toolkit.pro @@ -1,5 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ - src \ - projects + src diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/alphanumeric/alphanumeric.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/alphanumeric/alphanumeric.pro deleted file mode 100644 index d65137db..00000000 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/alphanumeric/alphanumeric.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = aux - -cfg.files = config -cfg.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/projects/alphanumeric -INSTALLS += cfg - -!prefix_build: COPIES += cfg diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/demonumerals/demonumerals.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/demonumerals/demonumerals.pro deleted file mode 100644 index a16edd28..00000000 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/demonumerals/demonumerals.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = aux - -cfg.files = config -cfg.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/projects/demonumerals -INSTALLS += cfg - -!prefix_build: COPIES += cfg diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/lipiengine.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/lipiengine.pro deleted file mode 100644 index f9ad55a7..00000000 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/lipiengine.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = aux - -cfg.files += lipiengine.cfg -cfg.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/projects -INSTALLS += cfg - -!prefix_build: COPIES += cfg diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/projects.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/projects.pro deleted file mode 100644 index 7109dc45..00000000 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/projects.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += \ - alphanumeric \ - demonumerals \ - lipiengine - -lipiengine.file = lipiengine.pro diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index d2ca2b67..23d9b414 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -319,6 +319,10 @@ lipi-toolkit { win32: LIBS += Advapi32.lib else: LIBS += -ldl record-trace-input: DEFINES += QT_VIRTUALKEYBOARD_LIPI_RECORD_TRACE_INPUT + ltk_projects.files = $$PWD/3rdparty/lipi-toolkit/projects + ltk_projects.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit + INSTALLS += ltk_projects + !prefix_build: COPIES += ltk_projects } t9write { |