diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2015-11-26 11:48:36 +0200 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2015-12-07 10:44:16 +0000 |
| commit | 8db16a42eac274076f9f7cab2b4c49c9fcb56af1 (patch) | |
| tree | dbc571cebb5ea782720fb0c0bf3a9e1be4fef963 /src/virtualkeyboard/virtualkeyboard.pro | |
| parent | 97d9648f5d950ea7d7b64f5c2db67359e8f47013 (diff) | |
[1/2] Fix static build
This change modifies the files that exist in the 1.3 version.
Fix static build of the virtual keyboard:
- Included instructions for the static build in the build doc.
- Added missing resource initialization macros to the plugin.cpp.
- Register QML module dependencies conditionally in the virtual
keyboard plugin initialization.
- Added missing attributes to the styles plugin qmldir file.
- Renamed StylesPlugin class to QtVirtualKeyboardStylesPlugin.
Change-Id: Idc1d35fbd95bd19932baaab13849a4a65d4e944f
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/virtualkeyboard/virtualkeyboard.pro')
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboard.pro | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index d6de55c6..515b1157 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -5,7 +5,7 @@ DATAPATH = $$[QT_INSTALL_DATA]/qtvirtualkeyboard QMAKE_DOCS = $$PWD/doc/qtvirtualkeyboard.qdocconf include(doc/doc.pri) -QT += quick gui gui-private core-private +QT += qml quick gui gui-private core-private CONFIG += plugin win32 { @@ -203,6 +203,15 @@ build_pass { !debug_and_release:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d } +static { + LIBS += \ + -L$$[QT_INSTALL_QML]/QtQuick.2 -lqtquick2plugin$$TARGET_SUFFIX \ + -L$$[QT_INSTALL_QML]/QtQuick/Window.2 -lwindowplugin$$TARGET_SUFFIX \ + -L$$[QT_INSTALL_QML]/QtQuick/Layouts -lqquicklayoutsplugin$$TARGET_SUFFIX \ + -L$$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard/Styles -lqtvirtualkeyboardstylesplugin$$TARGET_SUFFIX \ + -L$$[QT_INSTALL_QML]/Qt/labs/folderlistmodel -lqmlfolderlistmodelplugin$$TARGET_SUFFIX +} + !disable-hunspell { exists(3rdparty/hunspell/src/hunspell/hunspell.h) { SOURCES += hunspellinputmethod.cpp hunspellinputmethod_p.cpp hunspellworker.cpp @@ -334,5 +343,6 @@ include(generateresource.pri) RESOURCES += $$generate_resource(layouts.qrc, $$LAYOUT_FILES, /QtQuick/Enterprise/VirtualKeyboard) PLUGIN_TYPE = platforminputcontexts +PLUGIN_EXTENDS = - PLUGIN_CLASS_NAME = QVirtualKeyboardPlugin load(qt_plugin) |