aboutsummaryrefslogtreecommitdiffstats
path: root/src/virtualkeyboard/styles
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Doc: link errors qtvirtualkeyboardv5.9.0-beta2Nico Vertriest2017-04-061-1/+1
| | | | | | | | 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>
* Add full screen input mode for super wide screensJarkko Koivikko2017-01-302-2/+101
| | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-252-5/+3
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/virtualkeyboard/shifthandler.cpp Change-Id: I1f95238b9ac5deed3bec6d85f7433cafe219f7ea
| * 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>
| * Remove deprecated properties from ShiftKeyJarkko Koivikko2016-12-191-2/+0
| | | | | | | | | | | | | | | | | | | | These properties were not used by the default styles and already deprecated in version 1.2. The purpose of removal is to make qml lighter. Change-Id: Id75b991c3b74a958c4126b666cb95eadb46373a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Automatically hide word candidate listJarkko Koivikko2017-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support for automatically hiding word candidate list when inactive. This feature includes the following enhancements: - Added new settings: * VirtualKeyboardSettings.wordCandidateList.autoHideDelay * VirtualKeyboardSettings.wordCandidateList.alwaysVisible - Automatic hiding of word candidate list when inactive and when autoHideDelay elapsed. - alwaysVisible setting restores the old functionality. - Added new signal selectionListsChanged() to input method, allowing the input method to dynamically allocate or deallocate selection lists. - HunspellInputMethod does not allocate selection list when dictionary cannot be loaded, or Qt::ImhNoPredictiveText is enabled. Also, it will no longer use pre-edit text in this case. - OpenWnnInputMethod does not allocate selection list if not needed. [ChangeLog] Automatically hide word candidate list when inactive. Change-Id: Ifa95ae8a7c47a96719ffdc2929601ff2ef9c0d2e Reviewed-by: Gordan Markus <gordan.markus@pelagicore.com> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add language popupJarkko Koivikko2017-01-141-5/+58
|/ | | | | | | | | | | | | | | | | | | | | | This change adds language popup as an alternative method for selecting the input language. The language popup is enabled when the active style supports it. This change adds the support for the default style. The popup opens from the change language key with single tap and can be dismissed by tapping anywhere else on the keyboard. The old toggle method for changing the input language is still available and supported (can be enabled easily from keyboard style). Some basic tests are included in this change. [ChangeLog] Added language selection popup for faster selection of input language. Change-Id: Ie3773f1d0cac78dee8237285e8596fe57c8bb5e4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Improve the documentationv5.8.0-rc1v5.8.0Mitch Curtis2016-11-281-2/+2
| | | | | | | | | - Add some formatting to certain words - Use shorter qdoc syntax alternatives - Correct grammar Change-Id: I405c11826b9f624f0b0305e44b2d6b2b390df3da Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-1/+10
|\ | | | | | | | | | | | | Conflicts: src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf Change-Id: I2aac70f4bf65794c73096ec575c9f72bc63ec61c
| * Doc: Use standard documentation structure for the moduleLeena Miettinen2016-10-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Link to separate QML types and C++ classes topics from front page (instead of listing the types there) - Turn the \page topic that lists all QML types into the \qmlmodule topic for the module - Add a \module topic to list C++ classes - Add \ingroup, \title, and \brief commands to \qmlmodule topics to display the docs correctly in tables - Add standard content to \qmlmodule topics - Remove unused \qmlmodule topics - Fix \inmodule commands as necessary Change-Id: I6f6538264fff2ad38994114a2fed7212495a18c2 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Improve robustness of QML plugin loadingv5.8.0-alpha1Simon Hausmann2016-08-291-1/+1
|/ | | | | | | | Use a variable that expands to the latest plugin version instead of hard-coding the string. Change-Id: I00f9144be992be1426645bfd8dac4b9bbc45ad77 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add support for selection handles.Jan Arve Saether2016-05-201-0/+12
| | | | | | | | | [ChangeLog] Added support for selection handles for VKB. Currently, its only supported for the integrated VKB. Support for the dedicated VKB will be a separate commit Change-Id: I1f700fbc641bc68949b4cc81a8fa3aa275f34efa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Bump version number to 2.1Mitch Curtis2016-04-262-7/+8
| | | | | Change-Id: Idc71754cae27cb4222e2a5073533a4830e06f45d Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* Remove 'enterprise' from QML imports and QRC prefixesMitch Curtis2016-04-2610-25/+25
| | | | | | | | | [ChangeLog] Renamed QML import from "import QtQuick.Enterprise.VirtualKeyboard" to "import QtQuick.VirtualKeyboard", as the module is now open-source. Change-Id: I240a3c1b598ca4aa41d2aad02b6e548622308833 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* don't duplicate what qml_plugin/qt_plugin already doOswald Buddenhagen2016-04-131-13/+0
| | | | | Change-Id: I8e5a73b17bd863cbde71f62962a98e7af198c6a2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-131-1/+1
|\ | | | | | | Change-Id: I29c1fb602538bc847ec76573baf098bfe24630b8
| * don't pretend that we're tracking the qtqml moduleOswald Buddenhagen2016-04-081-1/+1
| | | | | | | | | | | | | | the result is the same, just without the confusion. Change-Id: I134932b38b423d876e5efdb4cc4ae89a1303919b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Don't perform lookup twice with associative containersAnton Kudryavtsev2016-03-221-4/+6
| | | | | | | | | | Change-Id: I58be9a4e57ed1cc8d9aaf6c26be517263f8c73c3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Replace foreach with range-based forAnton Kudryavtsev2016-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | Use qAsConst to prevent detaching where it's needed. qAsConst is not acceptable for rvalues, therefore catch them by const auto. Result: reduce text size. Change-Id: If773827f24dc5a45c264ad2ed6060c1a99720040 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | License updateKalle Viironen2016-01-1211-99/+187
|/ | | | | | Change-Id: I0dc6af72a3ae52a0b97b704df84fb1a8197aeeb8 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
* [1/2] Fix static buildJarkko Koivikko2015-12-073-3/+5
| | | | | | | | | | | | | | | 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>
* Refactor resource pathsJarkko Koivikko2015-10-282-2/+2
| | | | | | | | This change modifies the internal resource paths and makes them unique in the global context to avoid conflict with the application namespace. Change-Id: I72b17b744e07f5a94bb5ba99f3632d7f67b307ae Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add Cangjie input method for Traditional ChineseJarkko Koivikko2015-10-271-0/+12
| | | | | | | | | | | | | | | | | | This change adds Cangjie input method for Traditional Chinese. The input method is based on the TCIME input method for Android. https://code.google.com/p/android-traditional-chinese-ime/ The Cangjie input method is enabled by adding CONFIG+=tcime into qmake command line. The version of the Cangjie input is v3. Change-Id: Ibc49484d1277c332fc17e9b49b4227256ad88d5a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
* Add support for smallText in the BaseKeyJarkko Koivikko2015-10-271-0/+2
| | | | | | | | | | | | | | | | | | | | | This change adds support for smallText label in the key and also modifies the default behavior of alternative keys. The smallText property in the BaseKey is by default set to default alternative key. The keyboard layout can modify the smallText if necessary. However, the smallText is not visible by default. It can be set to visible at KeyboardLayout, KeyboardRow, KeyboardColumn or Key level. Previously the alternative keys included the "parent" key as the default highlighted item in the list. This behavior is now changed, and the "parent" item is filtered out from the effective list presented to user. Rationale for this is that if the smallText feature would be turned on for existing layouts, they would render the same key label twice. Change-Id: I543b2d3355be640d80f751444944a6dcefbbce73 Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
* License Headers UpdateKalle Viironen2015-10-2611-99/+132
| | | | | Change-Id: Iba2bd21b95dde1aac5750ac77856716e0c61e577 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
* Tidy up KeyboardStyle documentationMitch Curtis2015-10-141-33/+46
| | | | | Change-Id: I245fe4150ed0a0aa7cd9cfada0eb8e0476f28b0e Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix drawing errors in HWRJarkko Koivikko2015-10-132-4/+15
| | | | | | | | | | | | | | | | | | Multiple issues were identified in trace rendering: 1. quadraticCurveTo() method does not move the current position to endpoint in all cases. This causes a rendering glitch in situations where the line turns back sharply on x or y axis. The correct position is now ensured by the following moveTo() call. 2. Although this only was happening when running test cases, sometimes the trace rendering was started before the style attributes were applied to the drawing context. Now the start of trace rendering is delayed until the available becomes true. 3. The final lineTo() call was lacking prior moveTo() call. Task-number: QTRD-3680 Change-Id: I3ea311ee3a488a50f4c843a29d4c3cdd3942933a Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
* Add support for full screen handwriting inputJarkko Koivikko2015-10-071-0/+43
| | | | | | | | | | | | | | | | This change adds support for the full screen handwriting input. In full screen handwriting input, the user is able to use the whole application screen as a container for handwriting input. This feature is available to those application integrations, which integrate the new HandwritingInputPanel type to the application QML. The HandwritingInputPanel works as an add-on to the existing InputPanel, so it cannot be used exclusively without the InputPanel. Change-Id: I11530b9ccbc66aa59b210bec94d7bb87f0826370 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* [1/2] Ensure that debug and release are kept in separate locationsAndy Shaw2015-09-251-4/+5
| | | | | | | | | | | This also allows it to build both debug and release on Windows when debug_and_release is set by enabling build_all. This change modifies the project files which exist in 1.3 version. Task-number: QTBUG-47255 Change-Id: Ice75a7bcad0ea78ed987c9bb1b187415c9bf53a0 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* Correct file version, description, and product name for Qt VKBAntti Kokko2015-09-161-0/+2
| | | | | Change-Id: I6493d7bd73f4484a330e037839a4783cd9bdad34 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
* Correct license headers.Mitch Curtis2015-09-1511-110/+110
| | | | | | | | | | Using the commercial template found here: https://wiki.it.local/display/QTCOM/Header+templates+to+be+used+in+Qt+Code Change-Id: If401d8fa3ff4dab6ea1e74477d5c02b5dcd09eea Task-number: QTRD-3693 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Windows: Add version to .pro files.Friedemann Kleint2015-09-031-0/+5
| | | | | | | | | | | Currently, Windows explorer does not display any version information when right-clicking on one of the plugins/libraries. Add this version for win32 only (to avoid the version number becoming part of the file names on UNIX). Task-number: QTRD-3690 Change-Id: Ib5b0d0437b2017eb5acb6adcd8668b39df2aa28f Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
* Update version number to 2.0Jarkko Koivikko2015-08-314-7/+11
| | | | | | | | | | | Handwriting support was originally added as 1.4, but has been updated to 2.0 in this commit. Since the major version number has changed, all the components must be registered with the new major version number. Change-Id: I34c74f5dd24684423d153ff85a4a24eed8d4ffd1 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Optimize string handling in plugin registrationJarkko Koivikko2015-08-311-11/+11
| | | | | | | - Use QLatin1String for strings which are duplicated Change-Id: I3049e8c8bfc59caa4e80428bb0cb9e7c4a9061e2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add support for pattern recognition based input methodsJarkko Koivikko2015-06-176-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds generic support for pattern recognition based input methods. Added new API for the input engine and input method to process trace data. The trace data can originate from various input devices, e.g. from touch screen or from a dedicated hardware touch panel. Added new data model type for trace supporting both the C++ and QML interfaces. The new data model is DeclarativeTrace and Trace respectively, and it stores the trace data captured from the input device. The trace object is owned by the input method and is accessible to the UI layer, capture device and the input method. First, when the trace event begins, the capture device invokes the InputEngine.traceBegin(). The input engine forwards this call to the input method, which creates the trace object in response to successful call. Then the capture device receives the trace object and starts collecting the data. Also, in case of touch screen input, there are also the UI layer which renders the data. For this purpose there are new kinds of Style elements available in the Styles plugin. TraceCanvas is a specialized Canvas for rendering the trace object on screen. The TraceCanvas is a normal styling component, and can be customized like any other style element. Finally, the InputMethod.traceEnd() is called when the trace interaction ends. The trace is removed from screen automatically when the trace object is deleted. I.e., the input method has full control on how many traces it wants to collect for single recognition phase. Change-Id: I80ed90032f715726280197d9e94e7f0bd8280ff3 Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
* Add SVG image provider to Styles moduleJarkko Koivikko2015-06-175-1/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | With SVG image provider, it is possible to request the SVG images scaled to specified size using the URL parameters. In normal case, like with the QML Image, this would not be necessary, since the Image allows setting the sourceSize property, thus allowing to scale the SVG to desired size. However, in special cases, such as with BorderImage, the sourceSize is not available for modification, thus makes it impossible to leverage SVG scaling capabilities. With this change, the SVG images can be fetched from the new image provider available at image://qtvkbsvg URL and with the desired size given as URL parameters, for example: "image://qtvkbsvg/path/to/resource/mySvg.svg?width=123&height=456" It is also possible to give only one dimension, in which case the other dimension is calculated by the image provider from the design aspect ratio of the SVG image. Change-Id: Ided3035d0d414462b2c3eeaba0b8543a4c5ceea9 Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
* Fix crash if a selection list item is selected while transitioning outv1.3.0-rc1Jarkko Koivikko2015-04-101-0/+2
| | | | | | | | | | This crash occurs if the selection list item is selected right after the selection list is updated in such way that some of the items in the list are removed and transtioned away. If such item is selected, the application would crash. Change-Id: Iff7002932d94c9072044bb159af268cba3aa26ac Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
* Fix styles and settings 1.0 import, add version check testJarkko Koivikko2015-04-021-0/+1
| | | | | | | | | | | | Add missing version number for styles and settings modules. The settings module was initially published as the 1.2, where it should have been 1.0. Added 1.0 and 1.1 versions of the module, so that those imports will also work in future. Change-Id: Ia45f90714a365b9dcf06fb2256bb2c94a316d933 Task-number: QTRD-3576 Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
* Don't break apps with older import versionsGatis Paeglis2015-03-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | QML versioning works in the following way: a) New QML element is registered with a version number where it was introduced. Version number for this element should not be changed in later releases of the library to keep apps with older import versions to work without a need to update import statements in the app. b) For "import x.y" to work there must be at least one element registered for that version - x.y. QtQuick.Enterprise.VirtualKeyboard.Settings was introduved in 1.2 - we can't increment version for it because that would break older applications (see point "a"). - there are no new elements introduced in this namespace thus version for *.Settings remains 1.2. This is how Qt Quick Controls handle similar cases. Change-Id: Id8f5ca572d9f1558d607dc0abfac79d41865e099 Task-number: QTRD-3576 Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
* Update version number to 1.3Jarkko Koivikko2015-02-261-4/+3
| | | | | | Change-Id: I030e6a29d7e862c575e658a87aa8c22a268cfedb Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add support for defining candidate list transitions in styleJarkko Koivikko2015-02-251-0/+14
| | | | | | | | | | This change adds two new properties in the KeyboardStyle; selectionListAdd and selectionListRemove. These properties are optional and can specify transitions applied to items added or removed from the selection list view. Change-Id: I4661d51aa7b78e11e80779834fa2e518675f9d84 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove component versioning from qmldir filesGatis Paeglis2015-02-121-8/+0
| | | | | | | | | | | | | | 1) VKB's qml files are registered as qrc path in qmlRegisterType and are not deployed on the file system, qmldir files were referring to files in paths that do not exist. 2) QtQuick.Enterprise.VirtualKeyboard import is not a qml plugin (sub-class of QQmlExtensionPlugin), it does not need a qmldir file. Change-Id: Ieaa126361b006b15b19c81f19280c393392a94c9 Task-number: QTRD-3331 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
* Always use resources for QML filesSamuli Piippo2015-01-223-29/+17
| | | | | | | | | | | | Always compile all QML files into resources files, instead of generating resource files when using Quick Compiler. Saves some ifdefs in the code, since the file uris are the same in both cases. Also we are no longer dependent on the runtime path from QLibraryInfo::Qml2ImportsPath. It had problem in the prebuild QNX binaries, since the binaries had different prefix than what was used in the device. Change-Id: I19ee347244f56e4846831d4871f6667bce78d3a6 Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
* Remove hard coded file:// urlsJarkko Koivikko2015-01-081-1/+1
| | | | | | | | | | | | | The QLibraryInfo::location() method returns paths with native path separator. This results to an invalid url when the path is added to url with file://. In this commit the url is constructed from the local path using QUrl::toEncoded() method, thus ensuring the path separators are handled correctly. Change-Id: Ied128fc6931a1763e71863d11762bb09ca251e1c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Register QML files using runtime pathSamuli Piippo2014-12-042-4/+4
| | | | | | | | | | | QT_INSTALL_QML prefix points to sysroot when cross compiling, so those paths cannot be used for the QML registration. Instead use the path available from QLibraryInfo at runtime. Change-Id: I6556478558a3dda61e432aeef5f13667b9da626d Task-number: QTRD-3400 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
* Don't force installation paths when cross compilingSamuli Piippo2014-12-041-7/+1
| | | | | | | | | | | 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>
* Remove workarounds for compiled QMLSimon Hausmann2014-11-242-4/+2
| | | | | | | | | | | | | | | | | * Don't do CONFIG += qt. It is not necessary at all and has the effect that qt.prf gets loaded early, the QT and QT_PRIVATE variables are processed and only afterwards qtquickcompiler.prf is loaded - at which point it is too late to do QT_PRIVATE += the-frameworks-that-the-compiler-output-needs. The extra CONFIG += qtquickcompiler taped over the actual issue, which is CONFIG += qt. * There is no need anymore to #ifdef the QT_INIT_RESOURCE calls with special _qtquickcompiler suffix versions. However one QT_INIT_RESOURCE still needs to remain #ifdef'ed because the .qrc file is added to RESOURCES only conditionally in the .pro file. Change-Id: Ia44dea9d73bc3d8422893ad069dd47e6c3d90657 Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
* Change copyright noticeRainer Keller2014-10-066-17/+17
| | | | | | | | | - URL points to qt.io - Update year to 2014 Change-Id: I6a77715faf32c88fe2832a6d21a912a20e5dae50 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 18:24:43 +0000