summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove the plugin support for QInputContextLars Knoll2011-06-2225-1328/+3
| | | | | This will be handled through the lighthouse plugin instead.
* add a platform interface for input method supportLars Knoll2011-06-2211-84/+154
| | | | | | | | add QPlatformInputContext to help supporting complex text input. Communication with the focus objects/widgets will happen slightly different then before, through events instead of methods one can query on QWidget.
* Add libxcb-xfixes0-dev to xcb depsMorten Johan Sorvig2011-06-221-1/+1
|
* Compile fix (region is an accessor now, not a public member variable).Samuel Rødal2011-06-221-1/+1
|
* Add lighthouse event dispatcher API.Morten Sorvig2011-06-2245-180/+379
| | | | | | | | | | Platform plugin creation is now moved forward in order to have a platform plugin instance at event dispatcher creation time. Plugins are now responsible for implementing PlatformIntegration::createEventDispatcher and returning an QAbstractEventDispatcher subclass.
* Made QExposeEvent public and added exposeEvent() in QWindow.Samuel Rødal2011-06-228-14/+51
| | | | This is needed for applications that use QBackingStore directly.
* Compile.Friedemann Kleint2011-06-211-1/+0
|
* OpenGL API refactor.Samuel Rødal2011-06-2165-551/+475
| | | | | | Rename QGuiGLFormat to QSurfaceFormat, and make QWindow sub-class of QSurface and QPlatformWindow sub-class of QPlatformSurface, instead of having QPlatformGLSurface accessor in QWindow.
* Cocoa: fix compiler warningRichard Moe Gustavsen2011-06-211-1/+1
|
* Cocoa: add missing return statementRichard Moe Gustavsen2011-06-211-2/+1
| | | | Rev-By: sroedal
* Make readback-glx working again in wayland.Laszlo Agocs2011-06-212-1/+6
|
* Compile fix for readbackglx after surface->backingstore renaming.Laszlo Agocs2011-06-212-3/+2
|
* Compile.Morten Sorvig2011-06-211-1/+1
|
* Compile fix for platformsupport on Mac.Morten Sorvig2011-06-214-3/+9
| | | | | | | | | | Switch platformsupport over to be a shared library, which is well supported by the build system. This requires exporting classes we use. I've done this on OS_MAC only for now. Reverts 4581a9999e12e14bbf0836d0740191ba50109540
* Port Cocoa plugin to new backing store interface.Samuel Rødal2011-06-216-23/+21
|
* Rename QWindowSurface -> QBackingStore and split into platform / public.Samuel Rødal2011-06-2158-5471/+550
| | | | Also get rid of GL window surface and related classes.
* Compile fixes.Samuel Rødal2011-06-216-6/+7
|
* Mac: buildfix for cocoa lighthouse pluginRichard Moe Gustavsen2011-06-202-2/+2
| | | | Rev-By: msorvig
* Mac: buildfix for QtPlatformsupportRichard Moe Gustavsen2011-06-201-2/+3
|
* Don't crash if Clipboard and Selection hold the same mimedateLars Knoll2011-06-201-1/+2
| | | | | | | | Cliboard and Selection can hold the same QMimeData object. Don't delete the mimedata in this case before when clearing only one of them. Reviewed-by: Samuel
* use selection changed events from XFixesLars Knoll2011-06-204-22/+58
| | | | | | | | properly initialize the XFixes extension and then use the selection changed events to notify Qt apps. Reviewed-by: Samuel
* remove postscript related filesLars Knoll2011-06-203-1096/+0
| | | | | | We don't support postscript in Qt 5 anymore Reviewed-by: Gunnar
* Enhance Xcb clipboard codeLars Knoll2011-06-203-77/+149
| | | | | | | | | | Some cleanup on the data structures. Properly implement support for timestamps on each selection. Transfer selections to the clipboard manager on exit if it exists. Properly clear our selection when X11 asks us to do so.
* Add a platform API for QClipboard::ownsMode()Lars Knoll2011-06-203-4/+9
| | | | Simply forward ownsMode() to the QPlatformClipboard.
* Restoring QT_WAYLAND_GL_SUPPORT ifdefs.Laszlo Agocs2011-06-203-1/+28
|
* Mac: build fix. Make sure Platformsupport builds as a static lib.Richard Moe Gustavsen2011-06-201-0/+1
| | | | | | ...and not as an .app, as It did. Rev-By: Jørgen Lind
* Make glx wayland backends working.Laszlo Agocs2011-06-2021-336/+43
|
* Remove leftover xkb member variable in QXcbKeyboard.Laszlo Agocs2011-06-171-3/+0
|
* Compile.Friedemann Kleint2011-06-141-0/+1
|
* Autodetect the xcb backendJørgen Lind2011-06-108-6/+220
|
* Use XCB_GRAVITY_STATIC in XCB plugin for frame independent geometry.Samuel Rødal2011-06-102-1/+3
|
* Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into ↵Jørgen Lind2011-06-1011-19/+165
|\ | | | | | | refactor
| * Added frameMargins() API and support in XCB plugin.Samuel Rødal2011-06-109-17/+163
| |
| * Compile Windows.Friedemann Kleint2011-06-102-2/+2
| |
* | Compile fix, and remove warningsJørgen Lind2011-06-104-4/+6
| |
* | Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-10179-732/+1529
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/animation/animatedtiles/animatedtiles.pro examples/animation/appchooser/appchooser.pro examples/animation/moveblocks/moveblocks.pro examples/animation/states/states.pro examples/animation/stickman/stickman.pro examples/dialogs/configdialog/configdialog.pro examples/dialogs/sipdialog/sipdialog.pro examples/dialogs/standarddialogs/standarddialogs.pro examples/dialogs/tabdialog/tabdialog.pro examples/draganddrop/draggableicons/draggableicons.pro examples/draganddrop/draggabletext/draggabletext.pro examples/draganddrop/fridgemagnets/fridgemagnets.pro examples/draganddrop/puzzle/puzzle.pro examples/gestures/imagegestures/imagegestures.pro examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro examples/graphicsview/collidingmice/collidingmice.pro examples/graphicsview/elasticnodes/elasticnodes.pro examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro examples/itemviews/addressbook/addressbook.pro examples/itemviews/chart/chart.pro examples/itemviews/fetchmore/fetchmore.pro examples/itemviews/puzzle/puzzle.pro examples/mainwindows/menus/menus.pro examples/painting/basicdrawing/basicdrawing.pro examples/painting/concentriccircles/concentriccircles.pro examples/painting/imagecomposition/imagecomposition.pro examples/painting/painterpaths/painterpaths.pro examples/painting/transformations/transformations.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/qtestlib/tutorial1/tutorial1.pro examples/qtestlib/tutorial2/tutorial2.pro examples/qtestlib/tutorial3/tutorial3.pro examples/qtestlib/tutorial4/tutorial4.pro examples/qtestlib/tutorial5/tutorial5.pro examples/qws/dbscreen/dbscreen.pro examples/qws/svgalib/svgalib.pro examples/richtext/syntaxhighlighter/syntaxhighlighter.pro examples/statemachine/rogue/rogue.pro examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro examples/tools/styleplugin/plugin/plugin.pro examples/uitools/multipleinheritance/multipleinheritance.pro examples/widgets/analogclock/analogclock.pro examples/widgets/calculator/calculator.pro examples/widgets/calendarwidget/calendarwidget.pro examples/widgets/codeeditor/codeeditor.pro examples/widgets/icons/icons.pro examples/widgets/imageviewer/imageviewer.pro examples/widgets/lineedits/lineedits.pro examples/widgets/movie/movie.pro examples/widgets/shapedclock/shapedclock.pro examples/widgets/softkeys/softkeys.pro examples/widgets/tetrix/tetrix.pro src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg_p.h src/plugins/graphicssystems/meego/meego.pro src/plugins/platforms/fontdatabases/basicunix/basicunix.pri
| * Fontengine buildfix for xcb platform plugin.Tapani Mikola2011-06-105-11/+9
| | | | | | | | | | | | Change-Id: Ic909e1ac08163e62634643c68862e802a016b911 Reviewed-on: http://codereview.qt.nokia.com/442 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * tst_qnetworkreply: Fix divide by zero crash on MacOS XShane2011-06-101-1/+1
| | | | | | | | | | | | | | Change-Id: Ie1b6d5aa25a745eb6c16041151141efe99c051aa Reviewed-on: http://codereview.qt.nokia.com/422 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
| * Allow selecting fonts with irregular style namesJiang Jiang2011-06-0912-96/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fonts like "Helvetica Neue UltraLight" or "Skia Regular Black Condensed" can't be selected in Qt because either they don't report correct numeric values for weight/stretch/etc. or these values are not mapped from QFont enums in a linear way. Thus we provide a shortcut to select these fonts with PostScript name or full name without resorting to family name matching in QFontDatabase (these fonts are not registered in font database anyway). After this, we can simply use: QFont font("Helvetica Neue"); font.setStyleName("UltraLight"); to select these fonts. QCoreTextFontEngineMulti matched like this can be created directly from the CTFontRef instance instead of creating from the font name, making this process faster. The commit also cleaned up the font loading process in Mac font database a bit, moving the code for family matching into a separate function. Add QFontInfo::styleName() and QRawFont::styleName() to access the resolved style name for a font. Task-number: QTBUG-19366 Change-Id: Iad07768c02ed06cc8d6b7395dec554384f410506 Reviewed-on: http://codereview.qt.nokia.com/333 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Duplicate some harfbuzz symbols inside Qt.Gunnar Sletta2011-06-094-3/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done to remove a compile-time dependency on the harfbuzz source files inside qtbase/src/3rdparty. These are not accessible now that QT_SOURCE_TREE is not accessible as a qmake variable anymore. With the refactor branch we might solve this differently, but for now this is how we get svg and declarative to compile. Change-Id: I5dad23f2ea1f650e2621c1c1fcf39632a3a22ae8 Reviewed-on: http://codereview.qt.nokia.com/378 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Use homePath instead of homeDirPathEckhart Koppen2011-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | homeDirPath requires Qt 3 support, which is not enabled in all configurations. Change-Id: I7d51b880574021ef4569a4a2b16f06a7786dbb7d Reviewed-on: http://codereview.qt.nokia.com/415 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * Add tilde (both ~ and ~<user>) expansion to QFileDialog on UNIX.Pierre Rossi2011-06-082-4/+112
| | | | | | | | | | | | | | | | Task-number: QTBUG-3265 Change-Id: Id8062afe69e798e1f9cf3f4e967ae0d30c362b72 Reviewed-on: http://codereview.qt.nokia.com/411 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * Fix modules to load(qt_module) firstMarius Storm-Olsen2011-06-088-0/+16
| | | | | | | | | | | | | | Change-Id: Iabdfffff09088243863a8661add73298ed8baaf3 Reviewed-on: http://codereview.qt.nokia.com/413 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Complain if we don't load(qt_module) firstMarius Storm-Olsen2011-06-082-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not having load(qt_module) first in a .pro file which later does a load(qt_module_config) will likely overwrite compiler/linker options in the .pro file. This can be hard to figure out, and wasn't required before when we used a global .qmake.cache for all modules, since it 'preloaded' qmodule.pri file for all .pro files. Change-Id: I8a9aa3247f938be0b3b13f8c8cc96c18a142ba7b Reviewed-on: http://codereview.qt.nokia.com/412 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix typo from 1835afe6Marius Storm-Olsen2011-06-081-1/+1
| | | | | | | | | | | | | | Change-Id: I99e4407bbcb82cb27057ada838d73b6582867937 Reviewed-on: http://codereview.qt.nokia.com/379 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Reorder member varibles in QGlyphRunPrivate to eliminate warningJiang Jiang2011-06-081-4/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil (cherry picked from commit 74a1135341783449970d579b273d00c837ac14b0) Change-Id: I8e1c6bdc7f0957d8f389531f5f5682c536cdc286 Reviewed-on: http://codereview.qt.nokia.com/374 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Fix warning in qtextengine compilationJiang Jiang2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | enableHarfbuzz() should only be defined on Mac. Reviewed-by: Eskil (cherry picked from commit 5ce3fbb67b79c3732fd47b296ef9421398ca520c) Change-Id: I9ecb5db49478c3f5beb5d41cf99320f0faedce2e Reviewed-on: http://codereview.qt.nokia.com/375 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Fix compile when configure with no fontconfig supportJiang Jiang2011-06-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19716 Reviewed-by: Eskil (cherry picked from commit 5a598afa3f1928e9ad18257e2fa48fe3d5739917) Change-Id: I05107970e3273fce48303c9956e1c9aa928832b9 Reviewed-on: http://codereview.qt.nokia.com/376 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Fix usage of QT_SOURCE_TREEMarius Storm-Olsen2011-06-07107-159/+159
| | | | | | | | | | | | | | | | Functionality has been moved into qt_example.prf Change-Id: I81423eb4c5645f03b131932b2d37eceee9fea086 Reviewed-on: http://codereview.qt.nokia.com/371 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Fix regression that caused waitForXXX(-1) to fail.Thiago Macieira2011-06-073-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression was introduced by 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba when it failed to check when msecs == -1. This manifested visibly in KDE failing to connect to any SSL site -- kioslaves are synchronous and use waitForXXX(-1) (in this particular case, waitForEncrypted, which calls waitForReadyRead). Also, take the opportunity to convert these tests in QTcpSocket to use port 80 (a defined service in the test server) instead of port 22. Reviewed-by: Martin Petersson (cherry picked from commit cb5b6799333794496269aa7e6515f96c2ac96d37) Change-Id: I256a1e138e43fd45844976fe84cd2bc938552e47 Reviewed-on: http://codereview.qt.nokia.com/359 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>