summaryrefslogtreecommitdiffstats
path: root/src/core
Commit message (Collapse)AuthorAgeFilesLines
* Adaptations to Chromium 52Allan Sandfeld Jensen2016-09-1444-287/+333
| | | | | Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8Allan Sandfeld Jensen2016-09-075-2/+31
|\
| * Merge remote-tracking branch 'origin/5.7' into 5.8Allan Sandfeld Jensen2016-08-305-2/+31
| |\ | | | | | | | | | Change-Id: I82f7a6a6d1bf27dc8adf7e2a91ea8ab29c54a607
| | * Use pkg-config wrapper provided by qmakeMichal Klocek2016-08-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Switch to pkg-config wrapper provided by qmake to avoid exporting extra PKG_CONFIG_LIBDIR paths. Change-Id: I6c916d8d20965808af7b206c4fecf6c8791e93b4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Support the command-line argument --allow-running-insecure-contentAllan Sandfeld Jensen2016-08-262-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reads the chromium command-line argument and pass it on to WebKit. This also prepares for adding it as proper API later. Task-number: QTBUG-54902 Change-Id: I391940ef43a88332f45cc3c97fe22514d7f6a76c Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Ensure WebEngineContext::destroy() is called before the destructorAllan Sandfeld Jensen2016-08-231-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a false reference only removed after destroy() is called, so the tearing down of static objects won't dereference it before the QApplication is destroyed and the post routines including destroy() are called. Also adds a little safety by asserting destroy() has been called before ~WebEngineContext() and make sure we don't create a new WebEngineContext() during shut down. Task-number: QTBUG-54769 Change-Id: I2b1d189f9ebd8da2dc9f322f9bb307a5aa0c6a2f Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Pass alsa pulseaudio qt build settings for embedded buildsMichal Klocek2016-08-201-1/+10
| | | | | | | | | | | | | | | | | | Change-Id: I0996b08d661bc52233396a98acdf9d2e68876711 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Add context menu request to qml apiMichal Klocek2016-08-312-37/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce qml APIs to support custom context menus. [ChangeLog][QtWebEngine][QML] Added ability to show custom context menu. Task-number: QTBUG-52554 Change-Id: Ief0cbbbf221f4c6849e16bbba7417dccee59ad61 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Add dialog requests to qml apiMichal Klocek2016-08-313-3/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce qml APIs to support custom dialogs: * http and proxy authentication * javascript dialogs * file pickers * color pickers * form validation messages [ChangeLog][QtWebEngine][QML] Added ability to provide custom dialogs for HTTP and proxy authentication, JavaScript alerts, file and color picking, and form validation messages. Task-number: QTBUG-51190 Change-Id: I559ca59264750feb36ba7d3dba0bf0647509306d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Restore ability to build with Qt 5.7v5.8.0-alpha1Allan Sandfeld Jensen2016-08-281-3/+1
| | | | | | | | | | | | | | | | Defines the qtConfig() test for older Qt versions, and fix conflict between two QSGRectangle definitions. Change-Id: Icf4ef2f88d9e98e7aea4e88d777827bf69a4c281 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Add setting to enable printing of CSS backgroundsMichael Bruning2016-08-283-2/+9
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Printing] Printing will now include the CSS background of the printed elements by default. This restores the default behavior from Qt WebKit. It can be controlled via the PrintElementBackgrounds web setting. Task-number: QTBUG-54918 Change-Id: I37c37456dfec6368f22c36c515ac3cad1bbf8006 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Autocomplete view-source URLPeter Varga2016-08-241-1/+13
| | | | | | | | | | | | | | | | | | | | | | User may miss the URL scheme (eg. http://) when type a view-source url into the browser's location bar (eg. view-source:qt.io). This is not handled by the Chromium thus will produce an empty view-source page. The new autocompletion extends the incomplete view-source URL thus it will provide valid URL if it is possible (eg. view-source:http://qt.io/) Change-Id: I3edcd271cd0a971c9754e875db8f2a55a9a545de Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Enable PDF for desktop platforms and add chromium dependenciesMichael Bruning2016-08-246-3/+15
| | | | | | | | | | | | | | | | PDF is enabled globally, but disabled for the embedded platforms currently Change-Id: I44e1ffc8587ff8d8e677a47f8048feaef2e3266a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add core code for printing PDF data using PDFiumMichael Bruning2016-08-244-0/+303
| | | | | | | | | | | | | | | | | | | | | | Enables printing PDFs to QPrinters via PDFium. Bitmap to QImage conversion code based on code by Paulo Pinheiro <paulovap.os@gmail.com> Task-number: QTBUG-50556 Change-Id: I536200dc3dc56109624959b1d3d4644e4c20d1c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add widgets API for printing on a QPrinterMichael Bruning2016-08-245-42/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renders the content to a PDF document and then renders this on a QPrinter-backed QPainter using the PDFium library. PDFium bitmap to QImage conversion based on work by Paulo Pinheiro <paulvap.os@gmail.com>. [ChangeLog][QtWebEngineWidgets][Printing] Enables printing QWebPage content on a QPrinter. Currently does not support previewing the document. Widgets only for the moment. Change-Id: I9a5264433093379aee90f5e4f69bf2aee8814f2b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Work-around moc issueAllan Sandfeld Jensen2016-08-232-1/+5
| | | | | | | | | | | | | | | | | | Recent moc appears to have trouble parsing http_status_code.h, but it is only included due to an unnecessary include in web_engine_context.h we should have used a forward declaration for. Change-Id: Idd586bdb7719627b951a32905e4207fa8db0393d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Adjust webengine to the qtConfig() changes in qtbaseLars Knoll2016-08-236-20/+19
| | | | | | | | | | Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge dev into 5.8Oswald Buddenhagen2016-08-221-1/+1
|\ \ | | | | | | | | | Change-Id: I23aa7e41dfbbb7c4e4259a32868e64c58c0a1310
| * | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-1/+1
| |\| | | | | | | | | | Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
| | * Check if gpu fence is supported in pullTextureMichal Klocek2016-08-091-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-53972 Change-Id: Ie722e40e4763c5a78ce566d03fec6877d64b2023 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Fix crash on changing persistent storage pathAllan Sandfeld Jensen2016-08-211-0/+1
|/ / | | | | | | | | | | | | | | | | | | The deletion of HttpNetworkSession references the old HttpServerProperties so delete the session before we replace the properties. Task-number: QTBUG-55322 Change-Id: I420dc0523fda44423adaa5f4f0fa1df9ade4b584 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Add focusOnNavigationEnabled settingAlexandru Croitor2016-08-094-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The focusOnNavigationEnabled setting allows changing the behavior of whether a WebEngine view (widget or quick) will automatically get focus, whenever a navigation action happens (load, reload, previous history entry, etc). The default behavior before this patch was to always grab the focus. [ChangeLog][QtWebEngine][General] Add focusOnNavigationEnabled setting which allows controlling whether a web view will receive focus on a navigation request. Previously the view always received the focus. Task-number: QTBUG-52999 Change-Id: I6d30d973a41b53011131f21dcecbf6ec4d652759 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Make UserPrefs available without spell-checkingAllan Sandfeld Jensen2016-08-055-32/+16
| | | | | | | | | | | | | | | | Autofill and other components also need user preferences, so make it included by default. Change-Id: Id63241b2239451456ca8a8e1cd9771df4d48b8b8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-0526-112/+226
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove() and comboBoxPopupPositionAfterMove(). Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tools/qmake/mkspecs/features/functions.prf Task-number: QTBUG-55158 Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
| * Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-0221-91/+120
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| | * Do not use proxy when connecting to localhostErwin Kandler2016-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium does not exclude localhost connection from its proxy rules by default. When using a qt proxy with any other form of qt-based connections, connections to localhost are excluded by default. This patch adds localhost connections to the proxy-bypass rules. Change-Id: I76c43a2ae0de8d8fad455445a64a739c6c6b40f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Move core_generated.gyp to build directoryAllan Sandfeld Jensen2016-07-275-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes core_generated.gyp from being generated in the source directory to being generated in the build directory. Task-number: QTBUG-43014 Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Add persistent backend to channel id serviceAllan Sandfeld Jensen2016-07-194-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Channel-ids are only supposed to be memory only when running in off the record profiles. We have just never initialized the sql-based backend. We follow the cookie-settings, because channel-ids are used together with cookies, have similar implications, and newer Chromium versions will assert that cookie-store and channel-id store have matching storage models. Change-Id: I0a64146f0ed36a8913706bfc3fcadd7404894745 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Fix regression in updating cookie store settingsAllan Sandfeld Jensen2016-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | A copy-paste error meant we only updated user-agent settings when cookie store settings changed on a profile. Change-Id: I173ea7dfc309a30a3d3b98ee5ccab74e2abec456 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * Improve OpenGL implementation checkAkihiko Odaki2016-07-131-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt WebEngine uses `isOpenGLES` to know whether the OpenGL implementation is EGL with OpenGL ES 2.0. However, some non-ES OpenGL implementation such as eglfs_x11 uses EGL and are compatible with OpenGL ES 2.0. This change allows to use them. Also the change will allow to detect incompatible combinations. (i.e. EGL + ES-incompatible OpenGL, API other than EGL + OpenGL ES) Change-Id: I0abea253696d06ec365bde2176663700e8567f45 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Fix regression in text selectionAllan Sandfeld Jensen2016-07-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | While 'button' should officially be none on mouse move events, the aura and windows events set 'button' on mouse move, and selection code appears to depend on it. Change-Id: I49f84e6f9178c3b2cb0f2c2c8a7b1d30141d0b4e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Fix regression with fine-grained wheel eventsAllan Sandfeld Jensen2016-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The division needs to be done in float, otherwise steps smaller than one standard tick will be rounded to zero. Change-Id: Id939be062f1575104ca6cd66f05892841ec27569 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Switch WebContentsAdapter to using shared pointersAllan Sandfeld Jensen2016-07-016-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | QExplicitSharedDataPointer is meant for value objects, not for shared objects. Instead switch to using QSharedPointer. Change-Id: Ib3791bbcfde627a67508f2819e141d8c538a4a50 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
| | * Clear internal selected text when searchingAlexandru Croitor2016-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if a selection was made on a web page, and afterwards a find operation is executed, the selection in the web page would be cleared, but the call to selectedText() would still return the old selection. Make sure selectedText() is always cleared, when starting a find operation, as well as when stopping one. Change-Id: If78f0fa1dd836a52184015e749ef5a84b9f784cd Task-number: QTBUG-54071 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Remove handling of DIR_MEDIA_LIBSAllan Sandfeld Jensen2016-06-272-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DIR_MEDIA_LIBS was where ffmpegsumo was before 5.6 which removed it. When we don't have the library it used to be in, we return the fallback path, which by OverridePath will be created if it doesn't exits. DIR_MEDIA_LIBS is not used anywhere by Chromium anymore, so remove the code. Task-number: QTBUG-54258 Change-Id: I1015bd3549c617916c06b633ba3e483ef855ff84 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Stop linking both debug and release libraries at the same time.Alexandru Croitor2016-06-271-0/+7
| | | | | | | | | | | | | | | Change-Id: Ide3a8adc320b38a399514c0115bd8e24c37af63d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Reinstall the webChannelTransport on render process switchJocelyn Turcotte2016-07-282-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now have a state on the render process side in WebChannelIPCTransport to know if we should install the web channel transport or not, it's important to keep this state updated if a new render process is spawned for a WebContentsAdapter. Task-number: QTBUG-53411 Change-Id: Id0e9e537dcf09317ca3dafd4020a7ada8d16bb8b Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | Fix building on OS X 10.9 with 10.10 SDKAlexandru Croitor2016-07-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously building on OS X 10.9 was only allowed with a 10.10.3 SDK. But there is no supported version of Xcode on 10.9 that would ship with that SDK, which lead to the fact that there was no way to compile WebEngine with an officialy provided toolchain. This patch lowers the requirement of the SDK to 10.10, at the expense of disabling usage of API that was added in the 10.10.3 SDK release (Force Touch API). The required minimum Xcode version is thus bumped to 6.1, and the documentation is updated accordingly. Task-number: QTBUG-54486 Change-Id: I025caa336ceac5b8ea76ef451eb5e6b78abfe0c9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-274-22/+90
| |\| | | | | | | | | | Change-Id: Ic6686df8f82f710a3441501b7eeaffe69fbcbdf7
| | * Fix detection of MIPS architucture revisionAllan Sandfeld Jensen2016-06-241-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | We were not handling -march= arguments and we were not setting the result in GYP_CONFIG. Task-number: QTBUG-54336 Change-Id: I63e45f153aa46d5879aa968aa6c3d898ef58855e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Use angleDelta instead of deprecated Qt4 deltaAllan Sandfeld Jensen2016-06-231-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | Switch to using the Qt5 angleDelta instead of the Qt4 style delta that can only handle single orientation wheel events. Change-Id: I181dda03c7fc9c676100cb31ab7717f9641b625e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Always show caret when editing an IME pre-edit string.Alexandru Croitor2016-06-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously while entering a Japanese succession of characters, followed by transforming a substring into a word suggestion, the caret would disappear, and pressing the arrow keys would not indicate which part of the pre-edit string will be transformed next. This change makes sure the caret is always present, to indicate which part of the pre-edit string will be replaced by a possible IME suggestion. Change-Id: I350310c198bcacf0bcb48217f84b08e95ab8e8ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Handle IME events which contain both preedit and commit strings.Alexandru Croitor2016-06-171-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a QInputMethodEvent is received, which contains text in both the pre-edit and commit strings, Chromium would only show the commit string in the text input (or other html element). The IME though still knows about the non-empty pre-edit string, which means that if another key is pressed, Chromium will suddenly show the content of the previous pre-edit string AND the result of the new key press. To fix this, WebEngine will now properly set the pre-edit string as the new composition, after confirming the previous commit string. Change-Id: If22dd2038aca35a6fe6bb58a521f0a7124c7d468 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Fix backspace to work when removing last IME char.Alexandru Croitor2016-06-171-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when composing a word using an IME, and backspace is pressed to remove the last character present in the pre-edit string, instead of the character being removed, nothing happens. In reality the character is removed, but Chromium isn't notified of it, and the change will be seen only after another key is pressed. Fix consists in notifying Chromium to cancel the IME composition when both the pre-edit string and the commit string are empty. There is still an issue with japanese, when trying to input "aaa", press space, then "b" and you don't see the "b" until you press one more key. Change-Id: Idf2ef4888caead26d19eabbbdf4f98fbee601049 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Commit the done-so-far IME composition on mouse click.Alexandru Croitor2016-06-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, it was possible to select parts of the pre-edit text in an ongoing IME composition, by click-dragging with the mouse (which also looked wrong, because the styling of the text did not change to a selection box to signal selection). This is inconsistent with how Chrome does it, which commits the pre-edit string entered so far, when clicking anywhere in the content area or in the input. This change makes sure to commit the pre-edit string when a mouse click is done anywhere on the displayed web page. The behavior was present on Windows and Linux. Change-Id: I9cb148c591b5d09fb4dd477ae96c29ca32cc34de Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Don't cancel an IME composition when a modifier key is pressed.Alexandru Croitor2016-06-172-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an asian IME is used to compose a new word, and a modifier key is pressed (shift, alt, etc), WebEngine would notify Chromium to cancel the composition, thus clearing the text. But the actual IME window would still be present, and if another "letter" key was pressed, the composition would continue with the previous pre-edit text, which leads to unusual text flickering. The previous behavior was introduced in 31efe25d14 to fix a Windows double character input bug. The current change makes sure to clear the IME composition only in case the last received QInputMethodEvent pre-edit and commit strings were empty, which is not the case when pressing a modifier key for instance. Change-Id: Ic968404c90e1e0eb703fe1c2849990467bedd5e1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add View Source API and make the feature available from context menuPeter Varga2016-08-022-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtWebEngineQML][QQuickWebEngineView] View Source feature is now supported [ChangeLog][QtWebEngineWidgets][QWebEnginePage] View Source feature is now supported Change-Id: Icc16da71fc6ec95880897fc9744dd8be8c004e00 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add support for PPAPI shared memoryAllan Sandfeld Jensen2016-07-182-3/+7
| | | | | | | | | | | | | | | | | | | | | Install the handler for requests for shared memory from PPAPI plugins. Change-Id: I7c3c191253fea734c318e56ba07912900f1abf64 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Add missing consts in file picker controllerMichal Klocek2016-07-142-7/+7
| | | | | | | | | | | | | | | | | | Change-Id: I13a7e2d5b676e9c80561021610f4d647d75c63dd Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Switch away from deprecated QSG*Node classesAllan Sandfeld Jensen2016-07-142-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | Use the new public QSG classes meant to replace QSGSimpleRectNode and QSGSimpleTextureNode. Change-Id: Icdfc3b4ba13dd28258defa955d050927abbae95b Reviewed-by: Michael Brüning <michael.bruning@qt.io>