| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
This moves init-repository.py to tools/scripts since it should now
mainly be used by Qt WebEngine developers after our integration with
qt5.git.
Also remove the README file since most of the information is no as
relevant for the Qt module audience as it was for a labs project.
Change-Id: Iad9f6582d0ec0834cdaf38d0551d24f2c273badf
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: Iaa7439c759739a5bd2f1fbd10529c15e83497ecf
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
This test fails, because we get two loadProgress signals with
the 100 value if the page load is successful.
Change-Id: Idbd68c28ba81f8ff0a5b1d98aece82e7a940f1b9
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The real problem that this patch fixes is that moc and rcc generated
files are added to the gyp sources variable with an absolute path,
which for some reason triggers gyp to place the output file in the
same directory as the source instead of the Release or Debug
directories. This causes the last compiled file to be shared by both
the release and debug builds when building debug-and-release, and
MSVC will fail linking if the linked files have incompatible CRTs.
This patch fixes the issue by moving both the generated cpp files
and their compiled objects under <(SHARED_INTERMEDIATE_DIR), which
points to (Release|Debug)/gen.
Change-Id: I4143340acf56c3c7ed665aaae8f6221c310aafa9
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
|
|
|
|
| |
Upstream Chromium hasn't been building with the version of clang
available in Xcode 5.0 for a while and we have to disable the build
until we see a benefit to maintain this build environment.
Change-Id: Ia91844dc7f3be1b1623610be417409d0d065c623
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
| |
Change-Id: If391781604861961387019ea15e9c29b6a1e3e1a
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
The test_urlProperty() qml test has failed because the active url was
stored in LoadRequest in case of LoadFailedStatus.
With this fix the loadRequest stores the url of that page which implies
the request.
Change-Id: I6aab814a4a7d3b47043b03fccde3d9995b40d8fa
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
| |
Chromium has enabled this in the 37 based branch and it worked
with Qt WebEngine as well.
Change-Id: Idb1f9a2133be645cd044c9f0163cc87f6ae8e474
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of cancelling the request we have to set error to
net::ERR_ABORTED since URLRequest::BeforeRequestComplete
enforces not receiving cancelled requests with an assertion.
Our API requires the symmetric LoadStarten - LoadStopped
signals even on an ignored request so cancelling the request
and returning early would not be a solution, since it would
not emit any LoadStopped signal.
Change-Id: I1b13fe6520121805bcf420e810999c520c12bd5c
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
|
|
|
|
|
| |
Change-Id: I3412c8e7315020f517039290b03282513569ef2d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
syncqt.pl uses a combination of echo and sed to retrieve
the module version. It cannot run qmake, which would be
necessary for evaluating the version dynamically.
Change-Id: Ibdd95da5dc26edf18f005ab7f82e83136acd795e
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
This is necessary for finding gperf, bison, yacc, etc. on Windows.
Works only if the gnuwin32 directory is on the same level as the
qtwebengine root directory, which is the case with a qt checkout.
Change-Id: I09fe1523d4e4baca6612f1039bbba2e2ff9d87c0
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
| |
Change-Id: I048ffb55c6205373aa7c5a7e0a3d9e824415b379
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The fact that the error pages are HTML and get loaded through the
same mechanism should be kept an implementation detail and not be
considered as a new load in the API sense.
Also implement HasErrorPage for good measure and remove an anoying
warning from the demo browser.
The issue of the url not being changed remains in the QML test (but
it doesn't affect a typical browser-like UI since the user input is
still there untouched in the address bar), just make sure that failure
does not affect the later checks. It also seems like we have a focus
problem somehow, but the test should probably use a click for that
matter.
Change-Id: Ib5e363981a11287fdf4bfe84b93c999d96ed8087
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
Expose some "testable" settings as well as test the integration with
the QML Settings API.
Change-Id: I7ec6a7e695f60338b2c16a648e9a93b64ea29a94
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
| |
This seems to work well with the Chromium 37-based snapshot.
Change-Id: If7640bf7f2428db12eb2bd01707ef82df9014cf2
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
Expose settings in experimental for now.
Simply use the global/per-view mechanism as a group level
in between seems like overkill.
Change-Id: I7610e9c7765ccb41674702acdd24a52b87716da8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
Always check if there is another accessible set as title for the one
queried. For text fields also return the placeholder property if nothing
else is set.
Change-Id: I3f10ff04338a405ad8de00e75e15dded4aaeed3b
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
This reverts commit 0540dc569e5761378182485aadf4c91641f67d56.
The change in qtbase is in and qt5.git has been updated.
Change-Id: I6c44d2d8316e4f05a4f480ed276967d026c7a130
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since DoDelayedWork always returns the time of the next delayed work
to process, we would create a new timer for the same event every
time we process an event. This would cause a timer starvation on
Windows for example.
Instead of blindly creating timers, keep track of the requested delay
and create a new timer only if the new delay is shorted than the
currently scheduled one.
Change-Id: I2606231f0a48b8feb85f058a78eb772d26b222f3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We currently assume that MessagePumpForUIQt will only be used on Qt's
GUI thread but OSX and Windows do have some cases where TYPE_UI is
used for non-UI threads. This currently causes asserts in debug on
OSX since the DNS thread quits prematurely.
Instead of overriding all those edge cases to use TYPE_DEFAULT,
properly support MessagePumpForUIQt::Run by using a QEventLoop.
Change-Id: Icdb65966867ca6fd3679c75a698007f63848babc
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Posting a runnable on the GPU thread's message loop and creating a GL
fence sync there assumes that there is a current GL context, and that
synchronizing with this context will make sure that we wait for all
GL context producing any of our consumed texture mailboxes.
This is however not always the case like when:
- The current GL context on the GPU thread is destroyed right before
our runnable is handled, displaying errors on the console that
glFlush needs a current context.
- The GL driver will do extra scheduling and let the scene graph
thread synchronize its GL command stream only with the GL context
in which the fence sync was created.
To remedy the situation, make sure that Chromium creates a fence sync
for every sync points associated with a mailbox that we consume and
do so directly in the GL context associated with the originating
glInsertSyncPointCHROMIUM call. Wait for all those syncs on the Qt
side afterward.
This might also help with a few erratic behaviors noticed on some
embedded GL drivers.
Change-Id: I5fc60fcf51497477b2e1b3a535d0a141954fc6e5
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
| |
Change-Id: I57a85682d132bfefcdb0e3d1b3065f0474317e32
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When building debug-and-release, only the release version of
core_generated.gyp, defining NDEBUG, would be generated by
gyp_generator.prf.
Both the debug and release ninja files would be generated by gyp from
that same file and we would end up defining NDEBUG for src/core
source files even in debug while the rest of the content layer would
be properly built without it, causing crashes with object having
unexpected sizes and non-symetrical clean-up routines.
Skia doesn't seem to complain anymore if I build in release without
this so simply remove it.
Change-Id: I021f87f2dac5aa21831992824d39dc44216b5f58
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This adds API for overriding some certificate errors. Once overridden
any identical error for the same hostname and certificate will use
the same override.
Similar API for QtWebEngine QML should be added in a later patch.
Change-Id: I144147b86d9b592e3f87346a1e48890acee0c670
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
When we dispatch a request, we register it's callback with
different ID in the QWebEnginePagePrivate.
Change-Id: I1fa1f778de66fbedbd6cce35f6c823d5640dbe5e
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Not only this causes warnings because it is deprecated, it lead to a
crash in our QML tests when the callback fails to return a valid
engine instance.
Change-Id: I9412f138f87c39fbee8dbb6121a5bf0a69dcfbb4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
Because the files were recent additions or for other unclear reasons,
not all the files were updated to reflect the license change.
Change-Id: I6898f6f4f993f1efa9489382f0b94af285f8c4f5
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
| |
Change-Id: If1665b5bb7a6db07ca737aa00d0ddba964e418aa
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Chromium requires relative paths for output-dir and
for generator-output. Also output-dir is expected to
be a subdirectory of generator-output.
This now allows building on windows without running
qmake in recursive mode.
Change-Id: Ie0f9965c1fbfd63eb3cb9c360b29f210128a5c3e
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
| |
Ninja needs to have an _x64 appended to the configuration in order
to build the 64 bit targets on Windows, as opposed to Linux and OS X.
Change-Id: Idc9888c9f80ccb27d26fb86588ed39fba92a2c71
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
| |
-increases visibility to those pages.
Change-Id: I6b776157eee991907c8e2bc16c63df90a85663a3
Task-number: QTBUG-40757
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
| |
This includes the XCode 5.0 build fix.
Change-Id: I99a5a9b64cc4b31f41cc94eea380a1d61d7f7218
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Now that the CI configuration has been updated to support them,
use a relative submodule URL to make sure that we use the same
mirror for our submodule that was used for qtwebengine.
Change-Id: I92215bd3caef2bb33820185572f5bb088718f61f
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
| |
To have a more "discoverable" UX, and cleaner UI (requiring private
QML API for now).
Change-Id: Ic275287d429149a1c353a1cbdc5b7f9b19e57410
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
Those configurations should be re-enabled once we support them
properly.
Change-Id: Id8019df8e0b34a2fb1a411780689f28def50546f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
|
|
|
|
|
|
|
|
| |
For the WebEngineVersionBumper we have to remove the major version bits
after right shifting to determine the minor number.
Change-Id: I09f47dd261dc8de1e5cc94085ac3fdf3503588fb
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 7ea45766f6c49de9a81a387013fb1b98ab82766d.
This blocks our integration into qt5.git for now as we would need to update qtbase as well and prevent us from pushing build fixes beyond this change.
Let's get it in again after the alpha.
Change-Id: Ie57c99dd91fc19ae2695f8d881a0a8318e988806
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
|
|
|
|
|
| |
Change-Id: Idf1cd3990e2cfd9e2ed3b017370e689c1126bb48
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: Idbe0eafb51d77cc00e3a93179b81770724d5bfaa
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
| |
Change-Id: I32e7a89f5d86be18d8e10606af480fd082c214a8
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes a regression after the 37 upgrade where the select popups
would have the wrong position. Adjust to the new behavior and also
avoid doing a mapToGlobal of the position received in InitAsPopup.
RWHV::SetBounds has been giving us screen coordinates since the
Chromium 33 update, but popup locations somehow managed to work
properly through some side-effect sorcery.
This also fixes the value of window.screen[XY] in JavaScript which
wasn't updated when the window was moved.
Change-Id: I544499bafedccfb7d389b4abc48f1386c398473f
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
| |
Change-Id: I0a0d546779aa4a22411f5811880268a61e803b0e
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is done on initialization of the Web Engine as this should
happen before any contexts and Direct 3D devices are created.
It makes D3D9 create a device with the D3DCREATE_MULTITHREADED
flag and makes D3D11 enable multithread protection using the
ID3D10Multithread interface.
Depends on the appropriate counterpart in QtANGLE.
Change-Id: I8204de2f8ebe993273ff9f11af55caacb1290e4e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
| |
Change-Id: I7dc7261aadbbf08dbbeb1323cf46d24dc8e58e16
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Chromium itself requires XCode 5 to build and would require
a few modifications to build with the version of libc++ that
ships with XCode 4.
Disable the build on that environment to at least get passed
the Qt5 CI.
Change-Id: I296055ac1880a9e09e2c0e8343058ff5add837c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
| |
Change-Id: I61bda1aafc7513acdaeda99ef493ce50363d352e
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
| |
Change-Id: I2e21c19c193d94d2ebbaed0bc3b9b0aaa28e6e85
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
This changed with chrome 37. We only need to define it unconditionally
in gyp_qtwebengine as tcmalloc is never an option for us.
Change-Id: I8b21eb1114582c1d9a8aa61c5f15fc8469721395
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
| |
We now have the QWebEngineSettings class and can re-enable the features
that were previously disabled in the browser that depended on it.
Change-Id: I525dd1a4b5c380ad4c6060f276440e069f633897
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|