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
Paul Olav Tvete
86f20c89af
Track QPlatformGLContext API changes
2011-05-03 14:13:06 +02:00
Lars Knoll
3745e1bd79
reinstantiate a file that got removed by mistake
...
QPA was using a _qws.cpp file, that got removed by accident.
2011-05-03 13:32:59 +02:00
Joerg Bornemann
c04b7a55d1
qmake nmake generator: pass MAKEFLAGS to sub-make calls
...
Unlike other make tools nmake doesn't do this automatically.
Reviewed-by: ossi
2011-05-03 13:31:12 +02:00
Lars Knoll
4ebc56f4bd
remove a not required include.
2011-05-03 13:19:53 +02:00
Lars Knoll
ea55f60426
split the HexString template class out of qstylehelper
...
The class is used in quite a few places and has no relation
to styles. Split it out into it's own file to remove a dependency
between Gui and Widgets.
2011-05-03 13:19:29 +02:00
Lars Knoll
806e026043
remove qapp dependency
...
graphicssystems are not relevant in any case with qpa, so
we simply use the fallback case.
2011-05-03 13:16:52 +02:00
Lars Knoll
eba9bad431
QWS removal, part 2
2011-05-02 16:02:38 +02:00
Marius Storm-Olsen
1287361f64
Move private headers into versioned subdirectory
...
This will allow us to expose private headers in a controlled manner,
and ensure that they are not used by accident. This also means that
we internally will have to enable the private headers for the
modules we wish to use in the project.
2011-05-02 15:30:08 +02:00
Marius Storm-Olsen
2e8b6dcb4a
Install syncqt, and ensure it runs fine for external modules
2011-05-02 15:30:08 +02:00
Prasanth Ullattil
1606667d3e
Moved QtUiTools to CONFIG
...
QtUiTools is a staic library now. If this is added to QT variable
qmake will treat this as a framework on Mac. This patch is to
avoid that.
2011-05-02 15:30:08 +02:00
Marius Storm-Olsen
6319779bed
Add module.prf, and install MODULE_PRI for each module
...
Output warning if not present
2011-05-02 15:30:08 +02:00
Marius Storm-Olsen
738d5c7c85
Make sure we don't always pull in modules from installed mkspecs
...
When building Qt, qmake should not pull in mkspecs from an installed
version, as this will lead to incorrect paths for the current build.
So, here we ensure only to pull in modules from there we detected the
qconfig.pri, and ensure we still handle the QMAKEPATH case used by
some.
2011-05-02 15:30:08 +02:00
Paul Olav Tvete
481cd6a6b5
Track API change in QPlatformNativeInterface
...
Reviewed-by: Samuel
2011-05-02 15:00:22 +02:00
Lars Knoll
88e39d8654
remove Qt/Embedded.
...
Everybody use Lighhouse instead :)
2011-05-02 13:45:38 +02:00
Lars Knoll
6ac7f6afd0
make QPA the default platform
2011-05-02 13:31:26 +02:00
Martin Petersson
5aaa38c7ac
QNetworkConfigurationManager: Fix network polling.
...
startPolling() is called by each engine, so before it would start
multiple singleshot timers. So I moved the timer to the class
and check if it has already been started before it is activated
again. So that we just use one timer.
Task-number: QTBUG-17219
Reviewed-by: Iiro Kause
Reviewed-by: Kranthi Kuntala
(cherry picked from commit 2506b86828ca8140c2f22d85a4378df40899b132)
2011-05-02 12:39:40 +02:00
Martin Petersson
5be54b220a
QAbstractSocket: Fix waitForReadyRead infinite loop.
...
Make sure that waitForReadyRead times out if the read buffer is full.
Task-number: QTBUG-16123
Reviewed-by: Peter Hartmann
(cherry picked from commit 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba)
2011-05-02 12:39:12 +02:00
Martin Petersson
e4b289c276
Fix compile warning on Windows
...
Reviewed-by: Prasanth Ullattil
(cherry picked from commit 800ad68e4f000e65b0a83ef1da2a29d595964156)
2011-05-02 12:38:48 +02:00
Samuel Rødal
59ded5cce4
Implemented close event for QWindow and QWidgetWindow.
2011-05-02 12:00:00 +02:00
Samuel Rødal
3edff16c87
Properly handle the expose event for QWindow.
2011-05-02 10:52:15 +02:00
Samuel Rødal
3086f2098e
Set the window title even if it was set before calling create().
2011-05-02 10:38:33 +02:00
Samuel Rødal
5daea69f74
Resizing support in QWidgetWindow.
2011-05-02 10:36:39 +02:00
Eskil Abrahamsen Blomfeldt
ac4af55972
Make pixel size a qreal in QRawFont
...
The pixel size in the font engines is already a floating point value.
For maximum flexibility, we should expose this in the public API.
Task-number: QTBUG-18817
Reviewed-by: Jiang Jiang
(cherry picked from commit ac9e63b58533a3215106ed9da82cff3a3e3dda3a)
2011-05-02 10:13:32 +02:00
Dmitry Zelenkovsky
f26c4ba80d
Support more items for QTextCharFormat::VerticalAlignment enum for custom text objects.
...
* QTextCharFormat::AlignNormal - support text format descent, place text object bottom on (baseline - descent).
* QTextCharFormat::AlignBottom - place text object bottom on baseline.
* QTextCharFormat::AlignTop - Still not supported.
* Any other vertical alignment is mapped QTextCharFormat::AlignBottom.
Add new enum AlignBaseline for custom inline objects to take into account font baseline.
Merge-request: 2578
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from commit ee9455ed2a83084692d969c398ecb91bcd4fc33a)
2011-05-02 09:53:25 +02:00
Samuel Rødal
af77656f15
Proper child delivery of mouse and key events.
2011-05-02 09:26:40 +02:00
Paul Olav Tvete
a90d1b432c
Make the wayland plugin compile
2011-04-29 17:07:06 +02:00
Paul Olav Tvete
6e2bbb58fd
include file fix for wayland
2011-04-29 16:30:12 +02:00
Paul Olav Tvete
15d73f83bd
Compile after latest change.
2011-04-29 16:30:12 +02:00