Samuel Rødal [Wed, 4 May 2011 14:43:45 +0000 (16:43 +0200)]
Get rid of more QWidget / QApplication dependencies.
Lars Knoll [Wed, 4 May 2011 14:39:05 +0000 (16:39 +0200)]
remove QWidget dependencies.
Lars Knoll [Wed, 4 May 2011 13:53:10 +0000 (15:53 +0200)]
separate QPrinter and QPrintDialog
Removed all dependencies QPrinter had on QPrintDialog.
Samuel Rødal [Wed, 4 May 2011 13:13:18 +0000 (15:13 +0200)]
More QApplication prefixes changed.
Lars Knoll [Wed, 4 May 2011 13:14:29 +0000 (15:14 +0200)]
qdrawutil is for QtWidgets
the methods don't make sense for QML based apps
Samuel Rødal [Wed, 4 May 2011 13:03:45 +0000 (15:03 +0200)]
Use base-class prefix instead of QApplication:: where possible.
Samuel Rødal [Wed, 4 May 2011 12:58:13 +0000 (14:58 +0200)]
Move some cursor handling to QGuiApplication from QApplication.
Lars Knoll [Wed, 4 May 2011 12:58:52 +0000 (14:58 +0200)]
that signal has moved to QGuiApplication
Lars Knoll [Wed, 4 May 2011 12:54:22 +0000 (14:54 +0200)]
remove some unused code
QPaintDeviceRedirection is not being used any more.
Remove all code related to it.
Lars Knoll [Wed, 4 May 2011 12:48:03 +0000 (14:48 +0200)]
QStylePainter belongs in QtWidgets
Move it into the styles/ directory that will end up
in the QtWidgets library
Samuel Rødal [Wed, 4 May 2011 12:42:42 +0000 (14:42 +0200)]
Move KeyPlatform and currentPlatform() to QGuiApplicationPrivate.
Samuel Rødal [Wed, 4 May 2011 12:35:24 +0000 (14:35 +0200)]
Closing of popups in QWidgetWindow.
Samuel Rødal [Wed, 4 May 2011 12:24:47 +0000 (14:24 +0200)]
Remove unused variable.
Lars Knoll [Wed, 4 May 2011 12:37:50 +0000 (14:37 +0200)]
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.
Samuel Rødal [Wed, 4 May 2011 12:19:40 +0000 (14:19 +0200)]
Implemented enter / leave events for QWidget.
Samuel Rødal [Wed, 4 May 2011 11:57:06 +0000 (13:57 +0200)]
More fixes...
Samuel Rødal [Wed, 4 May 2011 11:28:35 +0000 (13:28 +0200)]
XCB plugin compile fix.
Samuel Rødal [Wed, 4 May 2011 11:14:33 +0000 (13:14 +0200)]
Fix compilation of QtOpenGL.
Samuel Rødal [Wed, 4 May 2011 10:38:39 +0000 (12:38 +0200)]
Improved handling of child windows.
Don't force-create QWindows until they're explicitly created or shown.
Lars Knoll [Wed, 4 May 2011 11:09:06 +0000 (13:09 +0200)]
forgot this file
Lars Knoll [Wed, 4 May 2011 11:08:02 +0000 (13:08 +0200)]
moving some more files around.
Lars Knoll [Wed, 4 May 2011 10:50:14 +0000 (12:50 +0200)]
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.
Lars Knoll [Wed, 4 May 2011 10:14:17 +0000 (12:14 +0200)]
remove constructor
Lars Knoll [Wed, 4 May 2011 10:04:43 +0000 (12:04 +0200)]
Merge remote branch 'origin/master' into refactor
Lars Knoll [Wed, 4 May 2011 09:51:33 +0000 (11:51 +0200)]
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.
Gunnar Sletta [Wed, 4 May 2011 09:38:42 +0000 (11:38 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
Eskil Abrahamsen Blomfeldt [Wed, 4 May 2011 08:52:20 +0000 (10:52 +0200)]
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)
Lars Knoll [Wed, 4 May 2011 08:34:40 +0000 (10:34 +0200)]
small cleanups
Samuel Rødal [Wed, 4 May 2011 08:42:54 +0000 (10:42 +0200)]
Proper sub-widget mouse grabbing in QWidgetWindow.
Samuel Rødal [Wed, 4 May 2011 08:40:20 +0000 (10:40 +0200)]
Get rid of warning in QPixmap::grabWidget().
Samuel Rødal [Wed, 4 May 2011 08:25:36 +0000 (10:25 +0200)]
Clean up some QWidget dependencies in gui/image.
Samuel Rødal [Wed, 4 May 2011 08:13:43 +0000 (10:13 +0200)]
Get rid of QCustomRasterPaintDevice / QWS stuff in raster engine.
Gunnar Sletta [Wed, 4 May 2011 08:08:23 +0000 (10:08 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
Samuel Rødal [Wed, 4 May 2011 08:02:42 +0000 (10:02 +0200)]
Get rid of remaining QWidget dependencies in QPainter.
Samuel Rødal [Wed, 4 May 2011 07:18:59 +0000 (09:18 +0200)]
Remove QWidget dependency in QPainter::initFrom().
Samuel Rødal [Wed, 4 May 2011 07:12:05 +0000 (09:12 +0200)]
Get rid of unused window surfaces.
Gunnar Sletta [Wed, 4 May 2011 08:01:37 +0000 (10:01 +0200)]
Merge branch 'qtquick2'
Gunnar Sletta [Wed, 4 May 2011 08:01:30 +0000 (10:01 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2
Gunnar Sletta [Wed, 4 May 2011 08:00:42 +0000 (10:00 +0200)]
Make it possible for animation driver to specify the advance time delta
Lars Knoll [Wed, 4 May 2011 07:31:54 +0000 (09:31 +0200)]
move keyboardInputLocale and keyboardInputDirection into QGuiApplication
Lars Knoll [Wed, 4 May 2011 07:18:55 +0000 (09:18 +0200)]
less qapp includes
Eskil Abrahamsen Blomfeldt [Wed, 4 May 2011 07:10:45 +0000 (09:10 +0200)]
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)
Lars Knoll [Wed, 4 May 2011 07:11:33 +0000 (09:11 +0200)]
Remove more QApp dependencies
platformIntegration() lives in QGuiApplication
QFont and QFontDatabase can live with QGuiApp only
as well.
Jørgen Lind [Tue, 3 May 2011 11:00:50 +0000 (13:00 +0200)]
Remove warnings
(cherry picked from commit
9625c564877414695a9706acf34bc8719018ef06)
Jørgen Lind [Tue, 3 May 2011 06:57:49 +0000 (08:57 +0200)]
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)
Kristian Høgsberg [Fri, 22 Apr 2011 01:14:43 +0000 (21:14 -0400)]
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)
con [Tue, 19 Apr 2011 14:15:09 +0000 (16:15 +0200)]
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)
Jørgen Lind [Wed, 20 Apr 2011 07:17:13 +0000 (09:17 +0200)]
Lighthouse: Fix virtual desktopwidget
(cherry picked from commit
69c759f5b84c2f6a44377e5f72cfe9d5bf7344c6)
Lars Knoll [Tue, 3 May 2011 20:51:17 +0000 (22:51 +0200)]
even less QT3_SUPPORT
the new libQtGui should now be free of any
Qt3 related methods.
Lars Knoll [Tue, 3 May 2011 20:37:25 +0000 (22:37 +0200)]
remove more QT3_SUPPORT code
Lars Knoll [Tue, 3 May 2011 19:51:54 +0000 (21:51 +0200)]
remove obsolete stuff
everything inside QT3_SUPPORT is gone in
gui/painting
Lars Knoll [Tue, 3 May 2011 19:25:04 +0000 (21:25 +0200)]
remove postscript support from Qt
I really wanted to do this since many years
already! :)
Lars Knoll [Tue, 3 May 2011 19:14:05 +0000 (21:14 +0200)]
remove more QApplication dependencies
Lars Knoll [Tue, 3 May 2011 19:06:20 +0000 (21:06 +0200)]
move layoutDirection from QApplication to QGuiApplication
The concept is needed in both QWidgets and QML,
so it has to be in QGuiApplication.
Lars Knoll [Tue, 3 May 2011 19:05:50 +0000 (21:05 +0200)]
remove a few qapplication includes
Lars Knoll [Tue, 3 May 2011 18:30:20 +0000 (20:30 +0200)]
rename qwindow_qpa to qwindow
Lars Knoll [Tue, 3 May 2011 18:20:44 +0000 (20:20 +0200)]
QGuiApplication is not QPA specific
Rename files to reflect that QGuiApplication is
going to be used everywhere.
Eskil Abrahamsen Blomfeldt [Tue, 3 May 2011 13:06:13 +0000 (15:06 +0200)]
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)
Samuel Rødal [Tue, 3 May 2011 14:41:18 +0000 (16:41 +0200)]
Wheel event forwarding.
axis [Tue, 3 May 2011 14:21:07 +0000 (16:21 +0200)]
Added .tag file with Git revision.
Lars Knoll [Tue, 3 May 2011 13:00:21 +0000 (15:00 +0200)]
remove QApplication and QWidget dependencies in gui/image
The main place that'll still need work is QPixmap::fill(QWidget *)
and QPixmap::grabWidget()
Lars Knoll [Tue, 3 May 2011 13:00:21 +0000 (15:00 +0200)]
remove QApplication dependencies in gui/image
Lars Knoll [Tue, 3 May 2011 12:47:35 +0000 (14:47 +0200)]
remove a unneeded reference to qbackingstore
Samuel Rødal [Tue, 3 May 2011 12:47:10 +0000 (14:47 +0200)]
Pure QWindow with multiple windows and child windows example added.
Joerg Bornemann [Tue, 3 May 2011 12:49:38 +0000 (14:49 +0200)]
new configure.exe binary
Lars Knoll [Tue, 3 May 2011 12:22:36 +0000 (14:22 +0200)]
remove the graphicssystem code paths.
QPA's platform integration layer replaces the
graphics system now.
Paul Olav Tvete [Tue, 3 May 2011 12:11:45 +0000 (14:11 +0200)]
Track QPlatformGLContext API changes
Lars Knoll [Tue, 3 May 2011 11:32:59 +0000 (13:32 +0200)]
reinstantiate a file that got removed by mistake
QPA was using a _qws.cpp file, that got removed by accident.
Joerg Bornemann [Tue, 3 May 2011 07:52:30 +0000 (09:52 +0200)]
qmake nmake generator: pass MAKEFLAGS to sub-make calls
Unlike other make tools nmake doesn't do this automatically.
Reviewed-by: ossi
Lars Knoll [Tue, 3 May 2011 08:50:32 +0000 (10:50 +0200)]
remove a not required include.
Lars Knoll [Tue, 3 May 2011 08:40:58 +0000 (10:40 +0200)]
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.
Lars Knoll [Tue, 3 May 2011 08:35:49 +0000 (10:35 +0200)]
remove qapp dependency
graphicssystems are not relevant in any case with qpa, so
we simply use the fallback case.
Lars Knoll [Mon, 2 May 2011 14:01:57 +0000 (16:01 +0200)]
QWS removal, part 2
Marius Storm-Olsen [Wed, 20 Apr 2011 18:57:51 +0000 (13:57 -0500)]
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.
Marius Storm-Olsen [Thu, 7 Apr 2011 14:40:33 +0000 (09:40 -0500)]
Install syncqt, and ensure it runs fine for external modules
Prasanth Ullattil [Tue, 12 Apr 2011 11:50:27 +0000 (13:50 +0200)]
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.
Marius Storm-Olsen [Fri, 1 Apr 2011 10:47:28 +0000 (05:47 -0500)]
Add module.prf, and install MODULE_PRI for each module
Output warning if not present
Marius Storm-Olsen [Wed, 30 Mar 2011 16:59:54 +0000 (11:59 -0500)]
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.
Paul Olav Tvete [Mon, 2 May 2011 12:58:29 +0000 (14:58 +0200)]
Track API change in QPlatformNativeInterface
Reviewed-by: Samuel
Lars Knoll [Mon, 2 May 2011 11:45:38 +0000 (13:45 +0200)]
remove Qt/Embedded.
Everybody use Lighhouse instead :)
Lars Knoll [Mon, 2 May 2011 11:31:26 +0000 (13:31 +0200)]
make QPA the default platform
Martin Petersson [Wed, 27 Apr 2011 10:36:53 +0000 (12:36 +0200)]
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)
Martin Petersson [Thu, 28 Apr 2011 10:07:07 +0000 (12:07 +0200)]
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)
Martin Petersson [Tue, 26 Apr 2011 10:03:17 +0000 (12:03 +0200)]
Fix compile warning on Windows
Reviewed-by: Prasanth Ullattil
(cherry picked from commit
800ad68e4f000e65b0a83ef1da2a29d595964156)
Samuel Rødal [Mon, 2 May 2011 10:00:00 +0000 (12:00 +0200)]
Implemented close event for QWindow and QWidgetWindow.
Samuel Rødal [Mon, 2 May 2011 08:52:15 +0000 (10:52 +0200)]
Properly handle the expose event for QWindow.
Samuel Rødal [Mon, 2 May 2011 08:38:33 +0000 (10:38 +0200)]
Set the window title even if it was set before calling create().
Samuel Rødal [Mon, 2 May 2011 08:36:39 +0000 (10:36 +0200)]
Resizing support in QWidgetWindow.
Eskil Abrahamsen Blomfeldt [Mon, 2 May 2011 08:06:44 +0000 (10:06 +0200)]
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)
Dmitry Zelenkovsky [Thu, 28 Apr 2011 09:49:13 +0000 (11:49 +0200)]
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)
Samuel Rødal [Mon, 2 May 2011 07:25:17 +0000 (09:25 +0200)]
Proper child delivery of mouse and key events.
Paul Olav Tvete [Fri, 29 Apr 2011 14:02:36 +0000 (16:02 +0200)]
Make the wayland plugin compile
Paul Olav Tvete [Fri, 29 Apr 2011 11:04:43 +0000 (13:04 +0200)]
include file fix for wayland
Paul Olav Tvete [Fri, 29 Apr 2011 14:29:09 +0000 (16:29 +0200)]
Compile after latest change.
Samuel Rødal [Fri, 29 Apr 2011 13:45:30 +0000 (15:45 +0200)]
Add QWidgetWindow to bridge events from QWindow to QWidget.
Gets rid of QWidget dependencies in QWindow and QWindowSurface. Events
are not delivered to the correct child widget yet.
Paul Olav Tvete [Fri, 29 Apr 2011 10:59:23 +0000 (12:59 +0200)]
Minimal plugin works again.
Jiang Jiang [Wed, 27 Apr 2011 14:05:09 +0000 (16:05 +0200)]
Use maximum ascent/descent/leading from fallback fonts in shaping
When shaping a QScriptItem with a multi font engine, currently we
only take the ascent/descent/leading from the primary (first) font
engine in that multi font engine, however, subsequent engines used
during shaping may have larger ascent/descent/leading, disregarding
them may cause clipping issues in some cases.
It's fixed by checking each font engine used in the shaping process
and take the maximum value instead of the first one. On ATSUI we
merely make it compile.
Task-number: QTBUG-16719
Reviewed-by: Eskil
(cherry picked from commit
c501403cb5a0c9ec21b00e0c2f640ae85566e0cf)
Jiang Jiang [Wed, 27 Apr 2011 09:39:09 +0000 (11:39 +0200)]
Another ugly hack to make bidi cursor work with Core Text
If the text is wrapped with LRE/LRO/RLE/RLO override/embed marks,
Core Text in Mac OS X 10.5 doesn't produce an empty glyph at the
beginning of the glyphs (while it does in Mac OS X 10.6), thus
we need to prepend an empty glyph here, otherwise cursor position
calculation will consider the first two characters as a ligature
of the same glyph.
Reviewed-by: Eskil
(cherry picked from commit
a36ac6c34bafa801c2c30d76f59e4a3594efc4d5)
Jiang Jiang [Wed, 27 Apr 2011 06:47:46 +0000 (08:47 +0200)]
Make sure layoutData exist before checking for string direction
Otherwise accessing that through QTextEngine::alignLine may cause crash.
Reviewed-by: Samuel Rødal
(cherry picked from commit
dcdb62c3d1a76d951c4b65bc1b1bd930e2ad14ec)
Jiang Jiang [Tue, 19 Apr 2011 12:40:19 +0000 (14:40 +0200)]
Take leading space width into account for painting and selection
When painting horizontally centered RTL text and selection with
trailing spaces, we need to take that space width into account
because line.textAdvance doesn't include it.
Task-number: QTBUG-18612
Reviewed-by: Eskil
(cherry picked from commit
224226727f07e8940e0d3131fe7587b11cc4a6ca)