diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-10-30 10:21:15 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-12-04 08:32:32 +0200 |
| commit | 706971597b5d13bfcc5f999aaca4f8f54d7d20f7 (patch) | |
| tree | 6df3ee2b23211ac434104102b023b510a4c0a96e /src/virtualkeyboard | |
| parent | ac202cba17914797d55d50c38266f202658584e9 (diff) | |
Don't force installation paths when cross compiling
Instead of forcing installation paths on different platforms,
trust that QT_INSTALL_ prefixes know where installation should
be done.
Change-Id: I073c3588107ee060c8d9316e3eb248a0c3487fa7
Task-number: QTRD-3400
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Diffstat (limited to 'src/virtualkeyboard')
| -rw-r--r-- | src/virtualkeyboard/3rdparty/hunspell/hunspell.pro | 8 | ||||
| -rw-r--r-- | src/virtualkeyboard/3rdparty/pinyin/pinyin.pro | 8 | ||||
| -rw-r--r-- | src/virtualkeyboard/styles/styles.pro | 8 | ||||
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboard.pro | 16 |
4 files changed, 6 insertions, 34 deletions
diff --git a/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro b/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro index 4dcc72fb..bb4596bb 100644 --- a/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro +++ b/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro @@ -12,13 +12,7 @@ debug { CONFIG -= qtquickcompiler # QTRD-3292 dll { - android-no-sdk { - target.path = /system/lib - } else:!isEmpty(CROSS_COMPILE) { - target.path = /usr/local/Qt-$$[QT_VERSION]/lib - } else { - target.path = $$[QT_INSTALL_LIBS] - } + target.path = $$[QT_INSTALL_LIBS] INSTALLS += target } diff --git a/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro b/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro index e688ac9d..b0d7c558 100644 --- a/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro +++ b/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro @@ -9,13 +9,7 @@ QMAKE_CXXFLAGS += -Wno-unused-parameter CONFIG -= qtquickcompiler # QTRD-3292 dll { - android-no-sdk { - target.path = /system/lib - } else:!isEmpty(CROSS_COMPILE) { - target.path = /usr/local/Qt-$$[QT_VERSION]/lib - } else { - target.path = $$[QT_INSTALL_LIBS] - } + target.path = $$[QT_INSTALL_LIBS] INSTALLS += target } diff --git a/src/virtualkeyboard/styles/styles.pro b/src/virtualkeyboard/styles/styles.pro index 2ef8e586..76972e87 100644 --- a/src/virtualkeyboard/styles/styles.pro +++ b/src/virtualkeyboard/styles/styles.pro @@ -1,12 +1,6 @@ TEMPLATE = lib TARGET = qtvirtualkeyboardstylesplugin -android-no-sdk { - INSTALL_PATH = /system/qml/QtQuick/Enterprise/VirtualKeyboard/Styles -} else:!isEmpty(CROSS_COMPILE) { - INSTALL_PATH = /usr/local/Qt-$$[QT_VERSION]/qml/QtQuick/Enterprise/VirtualKeyboard/Styles -} else { - INSTALL_PATH = $$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard/Styles -} +INSTALL_PATH = $$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard/Styles QT += qml quick CONFIG += plugin diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index 099b9ac2..f990052a 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -1,18 +1,8 @@ TEMPLATE = lib TARGET = qtvirtualkeyboardplugin -android-no-sdk { - INSTALL_PATH = /system/plugins/platforminputcontexts - QMLPATH = /system/qml/QtQuick/Enterprise/VirtualKeyboard - DATAPATH = /system/qtvirtualkeyboard -} else:!isEmpty(CROSS_COMPILE) { - INSTALL_PATH = /usr/local/Qt-$$[QT_VERSION]/plugins/platforminputcontexts - QMLPATH = /usr/local/Qt-$$[QT_VERSION]/qml/QtQuick/Enterprise/VirtualKeyboard - DATAPATH = /usr/local/Qt-$$[QT_VERSION]/qtvirtualkeyboard -} else { - INSTALL_PATH = $$[QT_INSTALL_PLUGINS]/platforminputcontexts - QMLPATH = $$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard - DATAPATH = $$[QT_INSTALL_DATA]/qtvirtualkeyboard -} +INSTALL_PATH = $$[QT_INSTALL_PLUGINS]/platforminputcontexts +QMLPATH = $$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard +DATAPATH = $$[QT_INSTALL_DATA]/qtvirtualkeyboard QMAKE_DOCS = $$PWD/doc/qtvirtualkeyboard.qdocconf include(doc/doc.pri) |