summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Simplify access to WebContents from adapter.Pierre Rossi2015-02-053-2/+10
| | | | | | Change-Id: I42cc8b28dd9aef9d23b83a43a60d8d59c16f4b1d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add settings to WebEngineProfilesAllan Sandfeld Jensen2015-02-0519-383/+222
| | | | | | | | | This patch adds settings to profiles so common settings might be shared among all pages in a profile. The former global settings are now replaced by the settings of the default profile. Change-Id: I544420e07beeb52ef29b2360bc7929402650cd07 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Propagate unhandled key events to the QtWebEngine view's parentJocelyn Turcotte2015-02-0512-9/+145
| | | | | | | | | | | | | | | | | | | | | | | | | This allows applications to receive unhandled key events from the page by setting an event handler on the view's parent widget/item, like it was possible with QtWebKit. This is different in that events first have to asynchronously go through the QtWebEngineProcess. If the WebEngine view has the keyboard focus, the events will be consumed inconditionally by the RenderWidgetHostViewQtDelegates, and a copy will be resent to the view's parent if it wasn't consumed. This sends it to the parent instead of the QWebEngineView directly since those are only unhandled events, unlike with other widgets where you can first intercept events. It is done that way also in cases where the QWebEngineView would be be the focus widget directly in the future, instead of the RWHV. If applications want to intercept key events before they reach the page, they need to use an event filter on the QWebEngineView's children or globally on the application. Change-Id: I3b48f5212d3f238a1c0497cec1db6ae3badbad26 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Handle multiple feature requestsAllan Sandfeld Jensen2015-02-044-12/+36
| | | | | | | | This patch makes it possible to have multiple outstanding feature requests and adds hooks for chromium to cancel requests. Change-Id: Icbeb30aa39ace090d853a29aefaeebbe726fe251 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update snapshot sha1Peter Varga2015-02-031-0/+0
| | | | | Change-Id: Iac92ae93480b4704fe7e40588ff8b3d46ea09b89 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix widgets download state updateAndras Becsi2015-02-023-1/+7
| | | | | | | | | | | | Since the DownloadState enum of core does not match the DownloadState enum of QWebEngineDownloadItem we should never directly compare it, instead we should convert with the toDownloadState() function, to fix the missing emission of the finished() signal. This patch also adds static asserts to verify the match of chromium's DownloadItem::DownloadState and our core DownloadState. Change-Id: I51110f55598230e380e15948f75219976d3a68a0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Forbid mismatching profiles when adopting web contentAllan Sandfeld Jensen2015-02-024-1/+14
| | | | | | | | | | | To avoid crashing due to a mismatch of browser-contexts used by webcontent and webcontent adapters and clients, we refuse to open content in a new window witha different profile and prints a warning so the developers may fix their software. Change-Id: I704266a96de2d7a5f8e1fa3ccf49a50f1d2307c9 Task-number: QTBUG-43898 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add widgets download APIAndras Becsi2015-02-027-2/+580
| | | | | | | | | | | This patch adds a QWebEngineDownloadItem class to the widget API and extends QWebEngineProfile with a signal to notify about initiated downloads, similar to the QML API. [ChangeLog][QtWebEngineWidgets] Add widgets download API Change-Id: I532de640934e1e93d63dfc347efb4113cb4a3d66 Reviewed-by: Jocelyn Turcotte <jturcotte@woboq.com>
* Add Qt WebEngine Quick API for allowing certificate errorsPaulo Pinheiro2015-02-0215-15/+307
| | | | | | | | | This adds API for overriding some certificate errors. Once overridden any identical error for the same hostname and certificate will use the same override. Change-Id: Idf9e968edca18751cbdab744880480750d0c1bd4 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Fix the build of tst_publicapiJocelyn Turcotte2015-02-021-1/+1
| | | | | Change-Id: If703ff2e5d8fd8ebfe92ad1ac3603c1abe5c7e53 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Rename HttpCacheMaxSize to HttpCacheMaximumSizeAllan Sandfeld Jensen2015-01-292-9/+9
| | | | | | | | The rename was only done in QWebEngineProfile but is missing in QQuickWebEngineProfile. Change-Id: Ib90d075fe3f4ddf5dbc7e22861d8e76574abb8dd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Document geolocation featureAllan Sandfeld Jensen2015-01-282-1/+2
| | | | | | | | | When the geolocation feature was activated, the feature request was not documented along with it. Change-Id: I8cb1b60015c3cffe7f3d035ea4f61625d81be5b0 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Update the expected list of public API testcaseAdam Kallai2015-01-281-1/+1
| | | | | | | | - Also fix the qtwebengineglobal_p.h header include in quickwebneignedownloaditem_p.h, because it is searched for wrong manner from the tst_publicapi testcase. Change-Id: I8997fafbf198f19a3d54b194f3408def6370417e Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Handle Shift, Ctrl and Alt key also when the keypad modifier is set.Michael Brüning2015-01-281-303/+310
| | | | | | | | | | | | When pressing one of these keys while already holding a keypad key, the keypad modifier was also added to the second key presses at least on OS X, leading to the key presses not being handled correctly. Includes minor coding style adjustment as well. Change-Id: Ia5c5af43256adf6cb4a97541351fee93bec08458 Task-number: QTBUG-42124 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Document QQuickWebEngineProfileAllan Sandfeld Jensen2015-01-271-0/+101
| | | | | Change-Id: I63621cec0f307fc3c0e71c84f99c68c0372d2992 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* [Windows] Enable WebGL and accelerated 2D Canvas.Michael Brüning2015-01-231-9/+0
| | | | | | | | | Now that we are using Chromium's SW compositor when using an ANGLE-based Qt build, it should be safe to re-enable those. Change-Id: Ib87ef38a5a381a389fef7e092328c9c5d116aa4e Task-number: QTBUG-42182 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Move newViewRequested to the public APISzabolcs David2015-01-239-9/+166
| | | | | | | | | | | | | This moves the API to public, with proper versioning, adds documentation and adjust the warning to also report an null parameter to openIn that would cause the load to fail. The experimental example code is copied from quicktestbrowser to quicknanobrowser. Change-Id: I23b06c7a5add0323d0540a783873584438d85ea8 Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Enable building Qt WebEngine without accessiblity enabled.Michael Brüning2015-01-2316-6/+64
| | | | | | | | | | | | | This adds guards that for QT_NO_ACCESSIBILITY being not defined around the code that uses accessibility types. It disables the quicknanobrowser and quicktestbrowser examples which need Qt QuickControls, which has a hard dependency to accessibility being enabled. Task-number: QTBUG-43305 Change-Id: Ifa39e3ce447ebc2124f52e00b29b1d7d2231035e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Introduce ASSERT_ENUMS_MATCH macroPierre Rossi2015-01-224-14/+16
| | | | | | | | For our common use case of compile-time checking enums that we want to keep in sync. Change-Id: I102d737ad986bf3dfff4d11a91afa3f3819a7947 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Improve geolocation permission securityAllan Sandfeld Jensen2015-01-223-4/+16
| | | | | | | | Ensure we only grant permission to the origin the user replied to, otherwise we might get a race exploit. Change-Id: I4f737148f4e41432c160b81c324531e9cde0edc6 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Replace the inspectable property with an environment variableJocelyn Turcotte2015-01-2211-55/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation would enable or disable the inspector globally when the inspectable property was set on a WebEngineView, overwriting the value previously set by other pages. Instead of havind default port for the debugging server and having to enable debugging on individual pages, use an environment variable, QTWEBENGINE_REMOTE_DEBUGGING, to enable the debugging server for the whole application at the same time as specifying the port. The format is the same as for QTWEBKIT_INSPECTOR_SERVER in QtWebKit. QTWEBENGINE_REMOTE_DEBUGGING is set by default in quicktestbrowser to ease development. This also keeps the input reading from the --remote-debugging-port command line switch for convenience, but its usage should be considered internal. This patch also take the opportunity to remove the unused DevToolsHttpHandlerDelegateQt::m_browserContext and to move the ownership from ContentBrowserClientQt to WebEngineContext since the list of inspectable pages isn't bound to the BrowserContext anyway. Change-Id: I772687f88f4feee0cc14dd182b0129cc0ea384dd Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Fix the inspector after the 40 updateJocelyn Turcotte2015-01-224-34/+72
| | | | | | | | | Update our copy of the DevTools code according to the modifications in Chromium 40. Add a DevToolsManagerDelegate subclass to re-add the target enumeration code and import the new shell Target code. Change-Id: I8c56faaf4dd77ca8f4129fcdc80690c7a117464b Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Fix the tst_navigationHistory QML testcaseAdam Kallai2015-01-221-0/+4
| | | | | | | | | | | | When the ListView component is created from the QQuickWebEngineHistoryListModel model. It requires an adapter to get the currentNavigationEntryIndex and navigationEntryCount for the QQuickWebEngineHistoryListModel::rowCount. Add the default rowCount value while the adapter is not unavailable because of the lazy adapter initialization. Change-Id: Id80d6f56adfea613bdc2c13d9caa1a12f50fddca Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix WebSockets after the 40 updateJocelyn Turcotte2015-01-211-7/+6
| | | | | | | | | | | WebSockets go through OnBeforeURLRequest but don't have a ResourceRequestInfo. We would force them to fail with an ERR_ABORTED. Fix the issue by not getting in the way and return net::OK in the cases where we won't intercept the request. Change-Id: I4cbb16171a9e7e295223e18946ae92004781b26b Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix gcc warning 'may be used uninitialized'Andras Becsi2015-01-201-1/+1
| | | | | | | Initialize glType to make gcc happy. Change-Id: I558ac822666d54a623e68cd2182895b05ba410c0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Add DownloadItemInfo to BrowserContextAdapterClientAndras Becsi2015-01-205-32/+67
| | | | | | | | | | | This extends the carried information from Chromium's content::DownloadItem with url, totalBytes and receivedBytes in preparation of adding a Widget API for downloads. DownloadItemInfo struct is now constructed to carry information about individual downloads from the content layer to the Qt API layer. Change-Id: I3ee7aea02b74994e612e1b3709195776d5e7570b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update submodule after updating Chromium to 40.0.2214.28.Zeno Albisser2015-01-201-0/+0
| | | | | Change-Id: Ib00b916b59d6bdf74250e77604b009d9fed15453 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Disable warning about use of deprecated functions on Windows.Zeno Albisser2015-01-201-1/+1
| | | | | | | This is only needed for compiling with MSVS2013. Change-Id: Ieb81539a8351143870c9c78591c8e8eb0fb41bca Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add Keyboard modifiers to MotionEventQt.Zeno Albisser2015-01-202-8/+90
| | | | | | | | | | Also fix the mapping of Ctrl and Meta keys on Mac OSX. On this platform Qt automatically maps Meta to Control and vice versa. Chromium however does not expect such behavior. Change-Id: Ia9913322ae8ae6ffd99feb6edfc91b9ea752c5cb Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* BrowserAccessibilityDelegate has been implemented in RenderFrameHostImpl.Zeno Albisser2015-01-203-80/+11
| | | | | | | | Adopt Accessibility functions from render_frame_host_impl.cc Change-Id: Ifa6752fd9daa3429d4016a91b85d7145b1fc2775 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Clipboard must now be subclassed.Zeno Albisser2015-01-202-113/+145
| | | | | Change-Id: I4c7a31746e0973c4ffb9c5e4cf2576b7ba03c37d Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Update Chromium to version 40.0.2214.28 and ninja to 1.5.3.Zeno Albisser2015-01-2044-310/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * scoped_refptr operator for implicit conversion to pointer has been disabled upstream: https://codereview.chromium.org/510323002 * Group permission API as done upstream: https://codereview.chromium.org/622793002 * content_worker gyp target has been removed upstream. * GetPageThumbnailData moved to DevToolsManagerDelegate. * ui/ui_resources has been renamed to ui/resources * WebPreferences and ResourceType have moved inside content. * Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(): https://codereview.chromium.org/457103003 * Remove obsolete accessibility events. * AX_EVENT_SELECTED_TEXT_CHANGED has been renamed to AX_EVENT_TEXT_SELECTION_CHANGED * AX_ROLE_MATH_ELEMENT was removed upstream. https://codereview.chromium.org/695133002 * Screen::IsDIPEnabled has been removed upstream. https://codereview.chromium.org/672823002 * Update DevToolsHttpHandlerDelegateQt according to ShellDevToolsManagerDelegate. * Various functionality from DevToolsHttpHandler was moved to DevToolsManagerDelegate https://codereview.chromium.org/560323005 * DevToolsHttpHandler::Start expects a scoped_ptr now. * Make sure event_factory_evdev.h is not included when USE_OZONE is not defined * ErrorPageParams was moved into namespace error_page. * Media Access is now handled by ContentBrowserClient::CheckMediaAccessPermission * SpecialStoragePolicy moved to namespace storage * Add implementation for new pure virtual function BrowserContext::GetSSLHostStateDelegate. * RenderPass::Id was renamed to RenderPass::RenderPassId * Include view_messages.h for ViewHostMsg_TextInputState_Param * CERT_UNABLE_TO_CHECK_REVOCATION has been deprecated by Chromium: https://codereview.chromium.org/449743002 * MailboxManager::ConsumeTexture only takes the mailbox as an argument * Replace RWHVQt::TextInputStateChanged with RWHVQt::TextInputTypeChanged. * RenderWidgetHostView::ScrollOffsetChanged has been removed. * SkBitmap::Config was removed upstream. * CopyFromCompositingSurfaceCallback has become an own type. * AcceleratedSurfaceInitialized only takes route_id as an argument. * ServerBoundCertService has been renamed to ChannelIDService. Related API has been renamed accordingly. * TextureImageTransportSurface was removed upstream. * Update MediaCaptureDispatcher::OnMediaRequestStateChanged signature. * AudioStream related functions are gone upstream. https://codereview.chromium.org/569713002 * Add implementation for RenderWidgetHostViewQt::GetLastScrollOffset. * Include generic touch_device implementation. * switches::kDisableDesktopNotifications was removed upstream. https://codereview.chromium.org/607843002 * PageTransition moved to ui. * Messages headers are not guarded. Including them multiple times does hurt. * ScaleGestureDetector does not create a standalone GestureDetector anymore. https://codereview.chromium.org/501503003 * MotionEvent::Cancel and Clone are not virtual anymore. https://codereview.chromium.org/502993004 * Exclude os_exchange_data_provider_mac from build. * Remove argument from ScopedClipboardWriter ctor. https://codereview.chromium.org/558913003 * Remove ShowPopupMenu override from WebContentsQt. The function is not pure virtual anymore, and we never implemented any specifics. * Do not use clang on desktop linux. * Request functions in ContentBrowserClient were merged into RequestPermission. * ninja: use configure.py --bootstrap instead of bootstrap.py Change-Id: I3575612826db7845461a949b4e737264bb4e8d88 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devPierre Rossi2015-01-1610-97/+125
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ied43de29444d4803218e250b096b9c72bc017af7
| * Refactor our build skipping logicPierre Rossi2015-01-161-23/+19
| | | | | | | | | | | | | | | | | | | | Move the logic to mkspecs to keep the .pro files robust. Add the basic infrastructure for config.tests, the first one of which will consistently ensure we have libcap on linux. Change-Id: Iee4207e747e589ba67d5353cb4c18f156e555c11 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Use paths relative to QtWebEngineProcess on OS X.Michael Brüning2015-01-151-2/+12
| | | | | | | | | | | | | | | | | | Fixes crashes of the QtWebEngineProcess on OS X 10.7 that were caused by the bundle paths not being returned correctly. Change-Id: Ic839978a6f1bff361cb76a3468bf978a738b6e82 Task-number: QTBUG-43181 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Make TLS1 the default minimum SSL protocol in Qt WebEngine.Michael Brüning2015-01-131-0/+0
| | | | | | | | | | | | | | | | | | | | This mitigates the risk of the POODLE vulnerability. Updates the 3rdparty submodule SHA1. Change-Id: I7557ecfd5f4f250a51e18432936b83502ba5d272 Task-number: QTBUG-43085 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Revert "Mac: INCLUDEPATH fix"Simon Hausmann2015-01-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a7da7f8ab00e6fe246ff8a02082305ea7f833fd3. Adding the install prefix to the inlude search paths causes us to pick up header files from there if there are any, which causes all sorts of issues. Conflicts: lib/lib.pro shared/shared.pro Change-Id: I070ff6443bb5612b3b7e3878d22dc9dd69d62e70 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| * Tell the ContentMainRunner to not reset signal handlers in the browser process.Michael Brüning2015-01-082-0/+1
| | | | | | | | | | | | | | | | | | | | | | This prevents problems when QProcess::waitForFinished is used from the same application as QtWebEngine. Updates the src/3rdparty SHA1. Change-Id: I373456b1ef9f65e55b89acd877b15e7115516d6b Task-number: QTBUG-42747 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Only deploy ffmpegsumo once in debug_and_releaseJocelyn Turcotte2015-01-071-51/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all installs inside the the release-only-with-debug-fallback block to prevent the debug ffmpegsumo.dll to overwrite the release one on Windows (and get use for both debug and release builds). This will use the release version for both instead by default. This also moves the load(qt_module) call higher to make sure that build_all is added to CONFIG at that point. Change-Id: I2584a28e5eaaf5028798703fb387ac2b120d7ea9 Task-number: QTBUG-43348 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * UIDelegatesManager: Remove creationContextForComponent.Robin Burchell2015-01-062-15/+6
| | | | | | | | | | | | | | | | | | This doesn't seem to be too much sense, and according to the QQmlContext documentation, may not work as expected: "This is only valid for components created directly from QML." Change-Id: I49db5dad49288d196e8519b1a60dcf2192147672 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| * UIDelegatesManager: Communicate load failure back to the dialog controller.Robin Burchell2015-01-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | If the dialog controller has asked to show a dialog, then if we cannot show a dialog, we should reject its request. Not doing this results in the WebView becoming frozen for input if the load fails, seemingly. Change-Id: I7dddd5357c712f896499cdebb142e60b5e80b4f2 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| * UIDelegatesManager: Always print errors if component loading fails.Robin Burchell2015-01-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | This setting is useful when developing a new UI set, and one may not initially know about the suppression of errors, which is a painful problem to run into. Furthermore, make sure to delete the failed component so that subsequent attempted use of it doesn't succeed if UI_DELEGATES_DEBUG isn't enabled. Change-Id: I3d2abc19fb4a007d06795d2e8149ae78d7c9c020 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2015-01-022-0/+25
| |\ | | | | | | | | | Change-Id: I155088b491e86d12eccf3c131acf9aad2dfd2a14
| | * OSX: Don't show QtWebEngineProcess in the dockv5.4.0Jocelyn Turcotte2014-12-022-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the LSUIElement key as Chromium does in its helper app's Info.plist to prevent seeing a jumping icon in the dock while the OS waits in vain for QtWebEngineProcess to create a window. Change-Id: I6c836621ec506fde04bc3825f64c49630a065351 Task-number: QTBUG-42955 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Widgets: Implement mouse lock permission APISzabolcs David2015-01-169-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the user grants the permission with mouse click on the feature permission bar, the RenderWidgetHostView loses the focus but the focus is necessary for the pointer lock. Change-Id: Ifafd86b472e400c5690194dce2ea8a829a51c313 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Add Pointer Lock supportSzabolcs David2015-01-1610-3/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the mouse is locked, the cursor is hidden from the user and mouse events are still generated. The movement which is reported by the event indicates what would be the position change if the mouse would not have been locked. Change-Id: I79b3df5d7d644cd675a27e6c5a0da54e00b69da3 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-1410-10/+60
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-0210-10/+60
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty src/core/content_browser_client_qt.h src/core/core_module.pro Change-Id: Ia05a6564a4d17ca14ff9b76ae018c3f4ef33d535
| | * | Use QDir::separator() where paths might be generated for WindowsAllan Sandfeld Jensen2014-12-151-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id7afc11cd58f671ff5ce629cfc29bdb6d9567dc2 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
| | * | Enable cmake config files generationJocelyn Turcotte2014-12-123-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As QtWebEngine now uses 5.x as its version number, we can just provide cmake tests and let qmake scripts do the rest. Task-number: QTBUG-42073 Change-Id: I28ccddbd1849980074dfbeefb5cb5a70c9209ab1 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 15:36:59 +0000