From c34a3ef3c5283df834577577bb0becd48470aa55 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Date: Thu, 26 Nov 2015 11:46:39 +0200 Subject: [PATCH] [2/2] Fix static build This change modifies the files that exist in the 2.0 version. Fix static build of the virtual keyboard: - Disable static build for lipi toolkit (as the architecture does not support static build). Change-Id: Iea73af647ffd10a6e5aedc12bd1e1b4e38d26827 Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> --- .../3rdparty/lipi-toolkit/src/lipiengine/lipiengine.pro | 2 +- .../lipi-toolkit/src/reco/shaperec/activedtw/activedtw.pro | 2 +- .../lipi-toolkit/src/reco/shaperec/featureextractor/l7/l7.pro | 2 +- .../src/reco/shaperec/featureextractor/npen/npen.pro | 2 +- .../reco/shaperec/featureextractor/pointfloat/pointfloat.pro | 2 +- .../src/reco/shaperec/featureextractor/substroke/substroke.pro | 2 +- .../lipi-toolkit/src/reco/shaperec/neuralnet/neuralnet.pro | 2 +- .../3rdparty/lipi-toolkit/src/reco/shaperec/nn/nn.pro | 2 +- .../src/reco/shaperec/preprocessing/preprocessing.pro | 2 +- .../3rdparty/lipi-toolkit/src/reco/wordrec/boxfld/boxfld.pro | 2 +- .../3rdparty/lipi-toolkit/src/util/logger/logger.pro | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiengine/lipiengine.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiengine/lipiengine.pro index d9e5c494..a794a0ca 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiengine/lipiengine.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiengine/lipiengine.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/activedtw/activedtw.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/activedtw/activedtw.pro index 14d0a779..89138d3b 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/activedtw/activedtw.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/activedtw/activedtw.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/l7/l7.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/l7/l7.pro index cf4ab455..f33de1e0 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/l7/l7.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/l7/l7.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/npen/npen.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/npen/npen.pro index b56f6929..fb455919 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/npen/npen.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/npen/npen.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/pointfloat/pointfloat.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/pointfloat/pointfloat.pro index ac091582..55c9b4cd 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/pointfloat/pointfloat.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/pointfloat/pointfloat.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/substroke/substroke.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/substroke/substroke.pro index 26527c6f..7e73b1f2 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/substroke/substroke.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/substroke/substroke.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/neuralnet/neuralnet.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/neuralnet/neuralnet.pro index 446f35c4..13ee7e03 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/neuralnet/neuralnet.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/neuralnet/neuralnet.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/nn/nn.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/nn/nn.pro index 6c3f8c2b..5849880e 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/nn/nn.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/nn/nn.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/preprocessing/preprocessing.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/preprocessing/preprocessing.pro index 1f0f8d76..42d024b4 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/preprocessing/preprocessing.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/preprocessing/preprocessing.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/boxfld/boxfld.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/boxfld/boxfld.pro index 1f4c4ec7..35835b35 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/boxfld/boxfld.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/boxfld/boxfld.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += exceptions CONFIG += warn_off CONFIG += plugin diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/logger/logger.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/logger/logger.pro index c7bfbcac..a4630aaa 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/logger/logger.pro +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/logger/logger.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG -= qt +CONFIG -= qt static CONFIG += warn_off CONFIG += plugin -- GitLab