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
Markus Goetz
9aa2feec0e
QNAM HTTP: Implement abort() and close()
2011-05-03 16:47:07 +02:00
Markus Goetz
718657d8b2
QNAM HTTP: Comments
2011-05-03 16:47:05 +02:00
Markus Goetz
ea4df8586e
QNAM: Function re-ordering
2011-05-03 16:47:03 +02:00
Peter Hartmann
aef6239e7d
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
...
This reverts commit e5d27e7aeac984e46f3aa8de20160cc00fc63155.
do not change the cache logic fundamentally.
2011-05-03 16:46:08 +02:00
Peter Hartmann
5fdd720425
HTTP caching documentation: add some comments
2011-05-03 16:43:58 +02:00
Peter Hartmann
04f2c4a7a7
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
...
This reverts commit 11838861a23ace66307306cf9c96b3f1910e09a9.
2011-05-03 16:43:56 +02:00
Markus Goetz
6d3044db95
QNAM: Fix initialization order warnings
2011-05-03 16:43:54 +02:00
Markus Goetz
b68f29720a
QNAM: TODO comments for Qt 5
2011-05-03 16:43:52 +02:00
Markus Goetz
5b2b0a7b35
QNAM HTTP: Fix upload progress signal
2011-05-03 16:42:55 +02:00
Samuel Rødal
ecd9c29a96
Wheel event forwarding.
2011-05-03 16:41:26 +02:00
Peter Hartmann
a5562d345b
HTTP caching internals: fix logic for PreferNetwork and PreferCache
2011-05-03 16:39:32 +02:00
Peter Hartmann
2aba57d58e
HTTP Network Reply Impl: return earlier when resource loaded from cache
2011-05-03 16:39:30 +02:00
Peter Hartmann
7876177c0c
HTTP Reply implementation: make cache validation method return bool
2011-05-03 16:39:28 +02:00
Peter Hartmann
76e04fdf3d
cache: rename validateCache() to loadFromCacheIfAllowed()
2011-05-03 16:38:45 +02:00
Markus Goetz
43b6320a5a
QNAM: Fix proxy code after refactoring
2011-05-03 16:34:58 +02:00
Peter Hartmann
0b7df28754
fix build
2011-05-03 16:34:56 +02:00
Markus Goetz
a0beeac097
QNAM: Start new HTTP backend architecture
2011-05-03 16:34:54 +02:00
Markus Goetz
f78640e5c2
QNAM: Copy files for new architecture
2011-05-03 16:34:52 +02:00
Markus Goetz
be4d62d3b7
QNAM: Improve internal proxyAuthenticationRequired()
...
Make it independent from the backend architecture
to improve refactorability.
Reviewed-by: Peter Hartmann
2011-05-03 16:34:50 +02:00
Markus Goetz
856da3ee19
QNAM: Improve internal authenticationRequired()
...
Make it independant from the backend architecture
to improve refactorability.
Reviewed-by: Peter Hartmann
2011-05-03 16:34:48 +02:00
axis
99454287bf
Added .tag file with Git revision.
2011-05-03 16:23:49 +02:00
Lars Knoll
4c6a882e86
remove QApplication and QWidget dependencies in gui/image
...
The main place that'll still need work is QPixmap::fill(QWidget *)
and QPixmap::grabWidget()
2011-05-03 16:21:47 +02:00
Lars Knoll
f1f5a80cfe
remove QApplication dependencies in gui/image
2011-05-03 16:10:52 +02:00
Lars Knoll
2ce57e22d0
remove a unneeded reference to qbackingstore
2011-05-03 16:10:52 +02:00
Samuel Rødal
61114c608d
Pure QWindow with multiple windows and child windows example added.
2011-05-03 14:56:18 +02:00
Joerg Bornemann
0996cf7645
new configure.exe binary
2011-05-03 14:49:38 +02:00
Lars Knoll
075634945d
remove the graphicssystem code paths.
...
QPA's platform integration layer replaces the
graphics system now.
2011-05-03 14:23:39 +02:00
