Commit Graph

15670 Commits

Author SHA1 Message Date
Peter Hartmann
0c9f327102 HTTP reply: do not load resources from cache that must be revalidated
The header field "Cache-Control: must-revalidate" is a strict
requirement for loading the resource from the server, and not reading it
from the cache without revalidating first. With this patch, PreferCache
will load such from the network instead of loading them from the cache,
and AlwaysCache will throw a ContentNotFound error.

Reviewed-by: Markus Goetz
Task-number: QTBUG-18983
2011-05-04 14:34:34 +02:00
Jiang Jiang
edf55f7d50 Remove QFontEngineFT::loadGlyphMetrics
It is no longer used and was accidentally merged back in.

Reviewed-by: Eskil
(cherry picked from commit 782535ac548c582542bd1c17207e288e816870a8)
2011-05-04 14:34:31 +02:00
Jiang Jiang
2a8d50ed6a Add required font metrics functions to QRawFont
Reviewed-by: Eskil
(cherry picked from commit 2c8df8bfb679885c3cbd2ee02f5e4053fdd554c2)
2011-05-04 14:34:21 +02:00
Peter Hartmann
863de43dca QNetworkCookie: allow spaces in unquoted values
We should follow
http://tools.ietf.org/html/draft-ietf-httpstate-cookie-23 , which says
parse the value until reaching the next ';' or the end of the line.
Other cookie implementations allow spaces in unquoted values as well.

Reviewed-by: Martin Petersson
Task-number: QTBUG-18876
2011-05-04 14:20:46 +02:00
Samuel Rødal
dc0f9f02a5 Implemented enter / leave events for QWidget. 2011-05-04 14:19:40 +02:00
Samuel Rødal
4e69052efc More fixes... 2011-05-04 13:57:06 +02:00
Samuel Rødal
a8c1cf755f XCB plugin compile fix. 2011-05-04 13:28:35 +02:00
Samuel Rødal
9631f6314c Fix compilation of QtOpenGL. 2011-05-04 13:14:33 +02:00
Samuel Rødal
f838dcc050 Improved handling of child windows.
Don't force-create QWindows until they're explicitly created or shown.
2011-05-04 13:14:29 +02:00
Lars Knoll
9ff98b92a1 forgot this file 2011-05-04 13:09:06 +02:00
Lars Knoll
3e8b53a46c moving some more files around. 2011-05-04 13:08:02 +02:00
Lars Knoll
401f078386 split kernel/ up according to the future library split
Create a guikernel/ directory that contains the files that'll go
into libQtGui. What remains in kernel/ will go into QtWidgets.
In addition to that image/, painting/ and text will end up
int QtGui.
2011-05-04 12:50:14 +02:00
Lars Knoll
004700532a remove constructor 2011-05-04 12:14:17 +02:00
Lars Knoll
1077edd108 Merge remote branch 'origin/master' into refactor 2011-05-04 12:04:43 +02:00
Lars Knoll
0e3823d30c remove dependency to QStyle::visualAlignment
The current position of the code in QGuiAppPrivate
is a bit messy, but we can later on consider
consolidating some of this in some helper
namespace.
2011-05-04 11:51:33 +02:00
Gunnar Sletta
c41153e693 Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging 2011-05-04 11:38:42 +02:00
Eskil Abrahamsen Blomfeldt
2e0003eda4 Include pixel size of font in exported HTML from QTextDocument
When you copy-pasted rich text in which the font size had been set
using setPixelSize() the font size would be mysteriously forgotten.
The pixel size property in QTextCharFormat was added ad hoc, and not
integrated in the HTML exporter.

Task-number: QT-4792
Reviewed-by: Gunnar
(cherry picked from commit 5aa5c2e2935c1829cc6965198968699f17c24ec0)
2011-05-04 11:20:59 +02:00
Lars Knoll
b9798615b4 small cleanups 2011-05-04 11:06:54 +02:00
Samuel Rødal
c418f5ce8d Proper sub-widget mouse grabbing in QWidgetWindow. 2011-05-04 10:42:54 +02:00
Samuel Rødal
07fef33d28 Get rid of warning in QPixmap::grabWidget(). 2011-05-04 10:40:20 +02:00
Samuel Rødal
3f3a950d6e Clean up some QWidget dependencies in gui/image. 2011-05-04 10:26:42 +02:00
Samuel Rødal
19822fa60c Get rid of QCustomRasterPaintDevice / QWS stuff in raster engine. 2011-05-04 10:13:43 +02:00
Gunnar Sletta
9c6347f245 Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging 2011-05-04 10:08:23 +02:00
Samuel Rødal
8d5df33f9c Get rid of remaining QWidget dependencies in QPainter. 2011-05-04 10:02:56 +02:00
Samuel Rødal
862263b0ab Remove QWidget dependency in QPainter::initFrom(). 2011-05-04 10:02:56 +02:00
Samuel Rødal
ea6c6d711b Get rid of unused window surfaces. 2011-05-04 10:02:56 +02:00
Gunnar Sletta
72395bc540 Merge branch 'qtquick2' 2011-05-04 10:01:37 +02:00
Gunnar Sletta
a41265a09e Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2 2011-05-04 10:01:30 +02:00
Gunnar Sletta
539602d43a Make it possible for animation driver to specify the advance time delta 2011-05-04 10:00:42 +02:00
Lars Knoll
2e9fd1325f move keyboardInputLocale and keyboardInputDirection into QGuiApplication 2011-05-04 09:31:54 +02:00
Lars Knoll
526bc2bf78 less qapp includes 2011-05-04 09:18:55 +02:00
Eskil Abrahamsen Blomfeldt
5bf2f85953 Compile on Windows
The SPI_FONTSMOOTHINGCONTRAST macro is not defined everywhere. When
the code was refactored, the workaround for this was lost. This
resubmits the work-around to make it compile.

Reviewed-by: Samuel
(cherry picked from commit 4c3630c1fcd2b3008f540a8906a19c533604f36a)
2011-05-04 09:12:40 +02:00
Lars Knoll
492bbdefd3 Remove more QApp dependencies
platformIntegration() lives in QGuiApplication
QFont and QFontDatabase can live with QGuiApp only
as well.
2011-05-04 09:11:33 +02:00
Jørgen Lind
d8c6e2773f Remove warnings
(cherry picked from commit 9625c564877414695a9706acf34bc8719018ef06)
2011-05-04 09:03:50 +02:00
Jørgen Lind
03aafc9d48 Fix Wayland plugin so it works with the wayland bind api
This is mostly for the xcomposite api, but also we needed to readEvents
after doing a connect
(cherry picked from commit 16c054125949b8f8ceec9626156d8790254a63a2)
2011-05-04 09:03:49 +02:00
Kristian Høgsberg
1e3e3980da wayland: Track wayland changes
Pass version number when creating proxies, use wl_ prefix when looking
up interfaces and drop wl_egl_display.
(cherry picked from commit c2adf9395214d711a3a40516c6c2afa64b3b4ca3)
2011-05-04 09:03:49 +02:00
con
95bbf56ff0 Support GL ES 2 with uikit.
For GL ES 2 teach the paint device about the fact that it
is doing rendering backed by a framebuffer object,
not a system framebuffer (which doesn't exist).
(cherry picked from commit 3b437a7706efbaaafdc4861393cbe21354cf4ee2)
2011-05-04 09:03:49 +02:00
Jørgen Lind
64fa65df74 Lighthouse: Fix virtual desktopwidget
(cherry picked from commit 69c759f5b84c2f6a44377e5f72cfe9d5bf7344c6)
2011-05-04 09:03:41 +02:00
Lars Knoll
54c9b1a80c even less QT3_SUPPORT
the new libQtGui should now be free of any
Qt3 related methods.
2011-05-03 22:51:17 +02:00
Lars Knoll
181df199d3 remove more QT3_SUPPORT code 2011-05-03 22:37:25 +02:00
Lars Knoll
52352c6c57 remove obsolete stuff
everything inside QT3_SUPPORT is gone in
gui/painting
2011-05-03 21:51:54 +02:00
Lars Knoll
34f712e79e remove postscript support from Qt
I really wanted to do this since many years
already! :)
2011-05-03 21:25:04 +02:00
Lars Knoll
f169264b7b remove more QApplication dependencies 2011-05-03 21:14:05 +02:00
Lars Knoll
5df3d517b4 move layoutDirection from QApplication to QGuiApplication
The concept is needed in both QWidgets and QML,
so it has to be in QGuiApplication.
2011-05-03 21:06:20 +02:00
Lars Knoll
91d2b267f1 remove a few qapplication includes 2011-05-03 21:05:50 +02:00
Lars Knoll
ac6878a2f1 rename qwindow_qpa to qwindow 2011-05-03 20:31:37 +02:00
Lars Knoll
5a91925514 QGuiApplication is not QPA specific
Rename files to reflect that QGuiApplication is
going to be used everywhere.
2011-05-03 20:31:37 +02:00
Eskil Abrahamsen Blomfeldt
e443d88501 Support gamma correction of text on GL
If the SRGB framebuffer extension in GL is available, we can support
gamma correction of text with a gamma of 2.1. On Mac this is
sufficient for gamma correcting subpixel antialiased text. Gray
antialiasing should not be gamma corrected on Mac.

On Windows, the user can potentially set the gamma value to anything
between 1.0 and 2.2 (or something like that). We support anything
that resembles 1.0 closely enough by pushing the text out without
any correction (like before). We also support anything that resembles
2.1 (the gamma hardcoded in GL's SRGB extension) by turning on the
extension before blending the text. In between the two, we'll use
gray antialiasing to avoid differing too much from the raster engine
(which is our reference in this.)

For gray antialiasing on Windows, we use a constant gamma of 2.3 which
has been determined by experimentation. Since this is close enough to
2.1 we do gamma correction with SRGB extension.

The distance limit of 0.2 is determined by some experimentation.

Reviewed-by: Samuel
(cherry picked from commit 79ba7cceca5e4029876ace2121edd25b08ae14ce)
2011-05-03 16:50:01 +02:00
Markus Goetz
8e9aa019bb QNAM HTTP: Removes some comments 2011-05-03 16:47:11 +02:00
Markus Goetz
100b7565aa QNAM HTTP: More comments 2011-05-03 16:47:09 +02:00