aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.9.3v5.9.3Jani Heikkinen2017-11-081-0/+24
| | | | | | Task-number: QTBUG-64210 Change-Id: If9a069208d3074736530d4b452138c0370721c43 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix build of pinyin plugin on platforms without pthreadJake Petroules2017-11-041-1/+1
| | | | | | | | | | | | | | ...such as VxWorks. Normally, the Qt dependency pulls in pthread, because the qt feature adds the thread feature (which in turn adds pthread and other necessary flags to the compiler and linker command lines), but in this case we don't have Qt so it must be manually added. Use the higher level abstraction instead of the direct -pthread flag, so that the compiler and linker flags used are taken from mkspecs. Task-number: QTBUG-63516 Change-Id: I88876810129078dfe4898314e45379ff87f95b80 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | Change-Id: I3f7a3f65f29345a43cac28ce3d449af309ea5089
* Merge 5.9 into 5.9.2v5.9.2Oswald Buddenhagen2017-09-251-0/+1
|\ | | | | | | Change-Id: I9ae9d6c248cc02aa1bf00c33b3d58d91948daddf
| * Add svg dependency in qtvirtualkeyboard.proZhang Xingtao2017-09-251-0/+1
| | | | | | | | | | Change-Id: I7e7678004a1f07dab895f375a5a01bdce4d744c2 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Add changes file for Qt 5.9.2Jani Heikkinen2017-09-221-0/+30
|/ | | | | | Task-number: QTBUG-62767 Change-Id: I617e68ece14c178012010b765663dd59ccb50996 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Ensure that EnterKey.label is actually shownMitch Curtis2017-09-152-3/+3
| | | | | | | | | | | | The ternary expressions were the wrong way around. This patch also makes the disabled EnterKey text more visible, as it was very hard to see before. Change-Id: I73b61ac7076e4c132c78e2c40be294e45bef3cc9 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* SelectionListModel: Fix use after freeMitch Curtis2017-09-122-3/+3
| | | | | | | | | | | | | Calling InputEngine::setInputMethod(null) did not clear the pointer value stored in SelectionListModelPrivate. Also, in case the input method is destroyed without setting it null, prevent use of dangling pointer in selection list model by using QPointer. Task-number: QTBUG-61308 Change-Id: If340d99a63489c54414497c61cd482e06a21c5ee Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Compile fix for MSVC 2015 as it does not work with QAtomicInteger<bool>Andy Shaw2017-08-156-9/+9
| | | | | | | This fixes the original commit - 9db37be7210d4071c8b2c7bfa98d1822075ab452 Change-Id: I6679ce07a4890f7d8d332f0400a5bbd2cc6bb577 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* 3rdparty/openwnn: Fix crash related to entering a smileyJarkko Koivikko2017-08-022-5/+12
| | | | | | | | | | | | | The crash occurs in Hiragana input mode only when pressing the space after entering a smiley. Fix it by handling the smiley as individual characters instead of text when submitting to OpenWNN engine. [ChangeLog][OpenWNN] Fixed crash when pressing the space after entering a smiley. Task-number: QTBUG-62143 Change-Id: Ic5f271bdfe05491ffd6147f1fc8eb9f54ef4e032 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: remove paragraph about needing to deploy the virtual keyboardMitch Curtis2017-07-271-5/+2
| | | | | | | | | | | | This has been handled automatically for a while now. We'll leave the section about the deployment location though, as that could be useful. Task-number: QTBUG-62099 Change-Id: Idc13302dbeb4ede632338747c492e5503ce2395c Reviewed-by: Kati Kankaanpaa <kati.kankaanpaa@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* styles.qrc: Remove qmldirFriedemann Kleint2017-07-261-1/+0
| | | | | | | | | | | | | | | | If a plugin is used, the qmldir file must be located next to the plugin in the file system. By it being included in the .qrc file it was deployed twice, once in the file system and once in the virtual resource file system. A recent change in declarative ended up doing an implicit import on that virtual directory and thus uncovered this bug of the qmldir file being present in a (virtual) directory where it doesn't belong. qml_module.prf takes care of deploying the qmldir. Task-number: QTBUG-62138 Change-Id: I7693b5656cb593454e2d777fe179e6f889d6dbdf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* 3rdparty/openwnn: Fix and optimize the engine due to QStringLiteralJarkko Koivikko2017-07-2513-1341/+390
| | | | | | | | | | | | | | | | | | | | | | | | | | | QStringLiteral is broken in MSVC2015 onwards when used with \uXXXX encoded character literals. This was the reason Japanese tests were failing - the OpenWNN engine was actually broken and producing garbage. Not only this change eliminates QStringLiteral from openwnn, but also reduces runtime memory usage by replacing QMap<QString, QString>. The new solution is based on simple binary lookup table WnnLookupTable. WnnLookupTable data was converted from existing QMap structures using WnnLookupTable::create() method, which was left there for future reference. This change also removes the unnecessary QObjectPrivate definitions from Romkan* classes. [ChangeLog][OpenWNN] Fixed and optimized OpenWNN engine (as a workaround for QStringLiteral breakage) Task-number: QTBUG-62133 Change-Id: I50c9e2f5c363e1314f47d7023685da543ec9a7eb Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 0bf1c6ad9e0b5572b8ea99f5fc8945dade5675b7)
* Use QSharedPointer::create() moreMarc Mutz2017-07-214-10/+10
| | | | | | | | | | | | Reduces allocations. This is the result of running the (experimental) clang-tidy check qt-modernize-qsharedpointer-create Discarded changes: none. Change-Id: I9ef1ccd46315f1bb8f3cc30a652f17c18b46232c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+26
|\ | | | | | | Change-Id: Id387390ae533debf39b008b456a94f4c427993b4
| * Add changes file for 5.9.1v5.9.1Jani Heikkinen2017-06-231-0/+26
| | | | | | | | | | Change-Id: Id3bdf678c9aff44fc636d1f1880e57e740a8ef8e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I72da022872d814fe1e21d111b77748d7e98fbb7a
* | Update license headersMitch Curtis2017-06-2212-100/+188
|/ | | | | | | | | | Some handwriting.qml files were using the old commercial license headers. Also updated the copyright year. Change-Id: Id603976bc6343797fd993e8041065d6afb2dc7a9 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* winrt: Disable buildMaurice Kalinowski2017-06-121-0/+1
| | | | | | | | UWP is not a supported target platform for virtual keyboard. Change-Id: I00ccbfeb4f77e07b1d46dd5d54f50b55e3b778d8 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Gordan Markus <gordan.markus@pelagicore.com>
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-312-0/+42
|\ | | | | | | Change-Id: Ied53fe56a6b9c9a71b5bbe9ed85270fb89ad8c5c
| * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0-beta4v5.9.0Antti Kokko2017-05-061-0/+34
| | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: Ib9ac4fff8076ed2ccaea696441a81eaa511568b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix bundling of module for static buildsJulian Strobl2017-05-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch the module is not bundled in static builds correctly causing 'module "<QtModule>" is not installed' errors in during runtime. As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)' at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false', which indicates that the module was not registered. Task-number: QTBUG-59559 Change-Id: I2856ceaf8148ccbe2c930ec5fdd878c084107ea3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | Change-Id: Ica0fcdd8f2ee9c467f7119a8fa249fe2c60e5a9d
* | Hunspell: Fix chained QString::arg() callsGordan Markuš2017-05-091-2/+2
| | | | | | | | | | | | | | Use multi-arg overload instead of chained QString::arg() calls. Change-Id: Idd279664e66655dfbc4f3f31bbf705ee6e387724 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Replace deprecated Q_ENUMS macro with Q_ENUMGordan Markuš2017-05-093-6/+9
| | | | | | | | | | Change-Id: I705129c56e968a72cf3d4de5b37b092cee93965c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix signal emissionGordan Markuš2017-05-091-1/+1
| | | | | | | | | | | | | | Use emit instead of calling a signal as a regular function. Change-Id: Id27031447ebd65c463f4bab5d074f2dbd7b6284a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: explain how the keyboard is shown in different integration methodsMitch Curtis2017-05-091-3/+8
| | | | | | | | | | | | Change-Id: I12400fab4eaef25fcfff5245d61c184958df506e Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Consistently check qApp and equivalents before using themUlf Hermann2017-05-054-6/+22
| | | | | | | | | | | | | | | | | | | | | | We might run an event loop after destroying qApp and additional events may be generated from that. Therefore we should not access qApp unchecked from event handlers. In most places we did already check qApp for null. Now we do it everywhere. Task-number: QTBUG-60000 Change-Id: Id72bbf133989e4f8127d85ee63cba64f915d3649 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-05-051-0/+3
|/ | | | | | | | | Currently boot2qt is tested with QEMU and some tests fail. Disabling them for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: I1c520d276bcb606d8d9fa5c7055688defb763867 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Allow for separate threads accessing the abort variable at the same timeAndy Shaw2017-05-043-3/+3
| | | | | | | | | | | This fixes a problem reported by Intel Inspector 2016 which indicated that multiple threads could access the abort variable at the same time. So by making it atomic we avoid any problems in this regard. Task-number: QTBUG-60037 Change-Id: I79d293916f5105e8a36c41d3bc89cd1cb93e5109 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Support for Q_OS_ANDROID_EMBEDDED and android-embedded buildsOtto Ryynänen2017-04-242-2/+2
| | | | | | | | | | | | | A Native Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. Those flags are set in mkspecs when building for embedded Android. This commit enables the possibility to build native Android builds (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I3f88568f34502c6cfafadbbebd4dd2212a3cd0c4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* pinyin: fix build warning on windowsGordan Markuš2017-04-222-1/+2
| | | | | | | warning: LNK4044: unrecognized option '/pthread'; ignored Change-Id: I76425aa3449e6e186f2bae9b0e62ede3fda14420 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix issues reported by clazyv5.9.0-beta3Gordan Markuš2017-04-192-1/+5
| | | | | | | | | * Add missing Q_OBJECT macros * Add missing Q_DECL_OVERRIDE macro Change-Id: I07fc44cae17a1db03eb0f32b0d6fc4eb85f4b395 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-181-1/+2
|\ | | | | | | Change-Id: I98bf52c02f0880233ff0d44d4b8ee410c6797579
| * switch to new way to refer to libdl5.8Oswald Buddenhagen2017-04-061-1/+1
| | | | | | | | | | Change-Id: Icc1696f0c58e0be75c951293a7bfda343e74d94d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * pinyin: depends on pthreadGordan Markuš2017-03-301-0/+1
| | | | | | | | | | | | | | | | Fix compilation error: userdict.cpp: undefined reference to `pthread_mutex_trylock' Change-Id: I1e067f2c047a2139f4b3d0f8d2ae404ca362157f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: link errors qtvirtualkeyboardv5.9.0-beta2Nico Vertriest2017-04-062-2/+2
| | | | | | | | | | | | | | | | ChangeLanguageKey.qml: Can't link to 'KeyboardStyle.languagePopupListEnabled' KeyboardStyle.qml: Can't link to 'full' Change-Id: I4f30db5cf517d4f6d61a786c356e41984d7fbb0b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix build without quickTasuku Suzuki2017-04-031-1/+1
| | | | | | | | | | | | Change-Id: I1280acbf6e8756935fff9ad7d4ececf5044785e7 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: correct link errors InputMethodv5.9.0-beta1Nico Vertriest2017-03-281-4/+4
| | | | | | | | | | | | | | | | trace.cpp:113: warning: Can't link to 'InputMethod.traceBegin()' trace.cpp:113: warning: Can't link to 'InputMethod.traceEnd()' Change-Id: I47377b78b7db41684cf92dc0f1f611acc589389a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QRegExp include cleanupSamuel Gaist2017-03-132-0/+2
| | | | | | | | | | | | | | This patch adds the missing include statements for QRegExp. Change-Id: I8dc1f257e34b20e93ba4d64da9c7ab8f5f97e88d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge dev into 5.9v5.9.0-alpha1Oswald Buddenhagen2017-02-0144-112/+1194
|\ \ | | | | | | | | | Change-Id: Icb2dbdff53ce80e15ebb75e8855ec9225140cdf6
| * | Add full screen input mode for super wide screensJarkko Koivikko2017-01-3025-57/+1119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In full screen mode the virtual keyboard replicates the contents of the focused input field to full screen input field located on top of keyboard. This mode can be activated by VirtualKeyboardSettings.fullScreenMode. [ChangeLog] Added full screen input mode for super wide screens. Change-Id: Ib2650c04767fb0945cc2bedc5b1801d254a15a41 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Disable Romanian handwriting layout by defaultGordan Markuš2017-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The handwriting layout in question will be enabled if t9write is enabled. Change-Id: If260a07f13532a6f9555c733bc4ddda295e8870c Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | gitignore: UpdateGordan Markuš2017-01-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | * Ignore .qmake files * Ignore test binaries Change-Id: I6571cfc219641c36c558d7de127c7198c98c1476 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-2521-53/+68
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/virtualkeyboard/shifthandler.cpp Change-Id: I1f95238b9ac5deed3bec6d85f7433cafe219f7ea
| | * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2017-01-181-0/+3
| | |\ | | | | | | | | | | | | Change-Id: I29d839af1423e622c4c4b3af7302d19f30b52b39
| | | * make debug-and-release fix qt 5.7 compatible5.7Oswald Buddenhagen2016-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtConfig() is new in 5.8. amends cdd7df86c. Task-number: QTBUG-56072 Change-Id: Ibea8d460165dd2e4eafe366105482ce93078ccc3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | | * fix debug-and-release buildsOswald Buddenhagen2016-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our lipi build system doesn't use any of the usual prfs, so it needs to deal with dual builds itself. Task-number: QTBUG-56072 Change-Id: Ife44fb4b29c0f55228b97579f4a4d9317e75f0aa Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * | Doc: clarify how KeyboardStyle::scaleHint is calculatedMitch Curtis2017-01-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-58154 Change-Id: I0598393589f9ac3933318906ec7aa5d33b1deb61 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * | Fix lipi-toolkit deploymentJarkko Koivikko2017-01-056-31/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>