Lars Knoll [Sat, 7 May 2011 20:57:49 +0000 (22:57 +0200)]
include fixes
Fixed the include statements
added QT+=widgets in examples/network to
get them to compile. Will need something better
than doing it manually.
Lars Knoll [Sat, 7 May 2011 20:25:30 +0000 (22:25 +0200)]
QTDIR/src compiles again
Lars Knoll [Sat, 7 May 2011 20:20:17 +0000 (22:20 +0200)]
fix remaining includes
Made easy thanks to the fixqt4includes
script
Lars Knoll [Sat, 7 May 2011 20:05:51 +0000 (22:05 +0200)]
fix for QtWidget include
Lars Knoll [Sat, 7 May 2011 19:52:08 +0000 (21:52 +0200)]
small script to fix Qt4 include headers
The script goes through all includes of the style of
and changes them to <QtWidget/QAction>
Simply run over your source code to get most compile
errors due to classes that moved between different
Qt libraries fixed.
Lars Knoll [Sat, 7 May 2011 19:24:37 +0000 (21:24 +0200)]
some build fixes
Lars Knoll [Sat, 7 May 2011 18:56:32 +0000 (20:56 +0200)]
get QtWidgets to link
some more changes, mainly exporting methods from
QtGui to get QtWidgets to link.
Lars Knoll [Sat, 7 May 2011 17:48:27 +0000 (19:48 +0200)]
fix class mapping
Many classes now live in QtWidgets.
Lars Knoll [Sat, 7 May 2011 13:05:43 +0000 (15:05 +0200)]
fix includes
Lars Knoll [Sat, 7 May 2011 13:04:58 +0000 (15:04 +0200)]
move to the right location
Lars Knoll [Sat, 7 May 2011 08:29:28 +0000 (10:29 +0200)]
make the new QtGui compile
Lars Knoll [Fri, 6 May 2011 22:02:01 +0000 (00:02 +0200)]
library split
Lars Knoll [Fri, 6 May 2011 21:52:43 +0000 (23:52 +0200)]
split up qguivariant into two files
Move everything that will end up in QtWidgets
into a qwidgetsvariant.cpp file. Currently
this is QIcon and QSizePolicy only.
Lars Knoll [Fri, 6 May 2011 20:08:43 +0000 (22:08 +0200)]
move QPalette into QtGui
also add QGuiApplication::palette() for the default
application palette.
Lars Knoll [Thu, 5 May 2011 17:15:03 +0000 (19:15 +0200)]
comment out references to QDragManager for now
Lars Knoll [Thu, 5 May 2011 13:56:15 +0000 (15:56 +0200)]
compile fixes
Samuel Rødal [Fri, 6 May 2011 10:45:11 +0000 (12:45 +0200)]
Get rid of qt_qpa_set_cursor from QGuiApplication for now.
Samuel Rødal [Fri, 6 May 2011 10:14:23 +0000 (12:14 +0200)]
Fixed qpa/windows example compilation.
Samuel Rødal [Fri, 6 May 2011 10:12:00 +0000 (12:12 +0200)]
Fixed compilation of Wayland plugin.
Samuel Rødal [Fri, 6 May 2011 08:47:49 +0000 (10:47 +0200)]
Get rid of stale QWidget-stuff from QGuiApplication.
Samuel Rødal [Fri, 6 May 2011 08:49:34 +0000 (10:49 +0200)]
Remove some OpenVG left-overs.
Lars Knoll [Thu, 5 May 2011 13:56:15 +0000 (15:56 +0200)]
compile fixes
Lars Knoll [Thu, 5 May 2011 13:38:01 +0000 (15:38 +0200)]
compile fixes
Lars Knoll [Thu, 5 May 2011 12:57:37 +0000 (14:57 +0200)]
remove qwidget dependencies from keymapper
Remove the QWidget dependencies from keymapper and
move it back into guikernel.
Lars Knoll [Thu, 5 May 2011 12:49:31 +0000 (14:49 +0200)]
move gesture event into qgesture.*
Since QGesture stays in QtWidgets for now, move
the event there as well.
Lars Knoll [Thu, 5 May 2011 12:19:52 +0000 (14:19 +0200)]
compile fixes
Lars Knoll [Thu, 5 May 2011 12:07:23 +0000 (14:07 +0200)]
remove some more qapp dependencies
Lars Knoll [Thu, 5 May 2011 12:02:45 +0000 (14:02 +0200)]
special directory for stuff we want to move from widgets to gui
Create a special to_be_moved directory, that will contain files
that are to be moved from QtWidgets to QtGui. This will allow
us to do a first split of the libraries rather fast and we can
then start pulling in these classes one by one.
Lars Knoll [Thu, 5 May 2011 10:23:13 +0000 (12:23 +0200)]
move some more files into proper places
Lars Knoll [Thu, 5 May 2011 08:38:43 +0000 (10:38 +0200)]
remove some dependencies to QTextEdit
QSyntaxHighlighter is now free of dependencies to
QtWidgets.
QTextImageHandler still needs some work to get
the url resolving to work again.
Lars Knoll [Thu, 5 May 2011 08:38:15 +0000 (10:38 +0200)]
remove some QApplication dependencies
Lars Knoll [Thu, 5 May 2011 07:55:00 +0000 (09:55 +0200)]
QPixmapFilter will live in QtWidgets
The class is only used for QGraphicsEffect. When merging
QtOpenGL into Gui and Widgets, the GL nased pixmap
filters will also need to be moved into effects/ and
the pixmapFilter() method in QPaintEngineEx can get
removed.
Lars Knoll [Wed, 4 May 2011 18:57:35 +0000 (20:57 +0200)]
remove OpenVG support
Qt5 will require OpenGL, so there's no need for
supporting OpenVG anymore.
Samuel Rødal [Wed, 4 May 2011 15:01:57 +0000 (17:01 +0200)]
XCB plugin compile fix.
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.