Commit Graph

39486 Commits

Author SHA1 Message Date
Friedemann Kleint
10a0cc3da2 BC cleanup in uitools.
Remove virtual functions obsoleted by new resource handling
in Qt Designer 4.4. Remove static hash of private objects
for formbuilder.
Requires fd61c9b24d27452df3eb478a81d7e7725fe6f5b4 in qttools.

Rubber-stamped-by: axis
2011-05-04 16:23:51 +02:00
Jiang Jiang
89cf89c51d Fix framework absolute path issue
module.prf incorrectly overwrites INSTALLS which results the absolute
soname not prepended.

Reviewed-by: Marius Storm-Olsen
2011-05-04 15:55:51 +02:00
Lars Knoll
b22f3a086e separate QPrinter and QPrintDialog
Removed all dependencies QPrinter had on QPrintDialog.
2011-05-04 15:53:52 +02:00
Samuel Rødal
7196329d32 More QApplication prefixes changed. 2011-05-04 15:13:47 +02:00
Lars Knoll
08ba97f653 qdrawutil is for QtWidgets
the methods don't make sense for QML based apps
2011-05-04 15:15:21 +02:00
Samuel Rødal
aa20a95f59 Use base-class prefix instead of QApplication:: where possible. 2011-05-04 15:03:45 +02:00
Samuel Rødal
7a0ae98978 Move some cursor handling to QGuiApplication from QApplication. 2011-05-04 14:58:26 +02:00
Lars Knoll
8c626b7079 that signal has moved to QGuiApplication 2011-05-04 14:58:52 +02:00
Lars Knoll
fd84bc720a remove some unused code
QPaintDeviceRedirection is not being used any more.
Remove all code related to it.
2011-05-04 14:55:11 +02:00
Lars Knoll
100e074126 QStylePainter belongs in QtWidgets
Move it into the styles/ directory that will end up
in the QtWidgets library
2011-05-04 14:55:11 +02:00
Samuel Rødal
5c16bb8a12 Move KeyPlatform and currentPlatform() to QGuiApplicationPrivate. 2011-05-04 14:42:42 +02:00
Samuel Rødal
e6af684ee4 Closing of popups in QWidgetWindow. 2011-05-04 14:35:36 +02:00
Samuel Rødal
4cc4cb3c51 Remove unused variable. 2011-05-04 14:35:36 +02:00
Lars Knoll
bd8d12b7f6 move platform specific files out of the way
Keep the files as reference to implement the
lighthouse plugins, but move them away from
the main directory hierachy as they won't be
part of Qt5 in any case.
2011-05-04 14:39:19 +02:00
Peter Hartmann
a4e3b2bd5e HTTP auto tests: do not load resources from cache that must be revalidtd
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:35:21 +02:00
Peter Hartmann
33ce5392e8 HTTP cache backend: do not load resources 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:35:09 +02:00
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