summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Morten Sorvig2009-09-17536-274/+239080
|\
| * qdoc: QGLContext::drawTexture referring to itself.Rhys Weatherley2009-09-171-4/+0
| |
| * Revert "Added support for subpixel antialiasing on text in the GL2 engine."Rhys Weatherley2009-09-178-181/+24
| | | | | | | | | | | | Breaks the GL2 paint engine on X11 and OpenGL/ES 2.0. This reverts commit b8ff02a67ebd8246253823b53cfed98eef400547.
| * Simplify QDirectFBPixmapData::fromDataBufferAnders Bakken2009-09-161-48/+3
| | | | | | | | | | | | | | | | There's no need for the intermediate surface creation. RenderTo will handle things like palette/transparency etc. Should also provide some speedup. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * Make QT_DIRECTFB_PALETTE an opt-in optionAnders Bakken2009-09-162-3/+3
| | | | | | | | | | | | | | This seems not work correctly on quite a few boards so I'd rather have people turn it on explicitly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| * have make_qfeatures_dot_h use QTSRCDIR if defined, update qfeatures.hJeremy Katz2009-09-162-17/+22
| | | | | | | | Reviewed-by: Paul
| * QGlobal: fix Windows error reportingPeter Hartmann2009-09-161-1/+1
| | | | | | | | | | | | | | before, we did not retrieve the detailed error message correctly on Windows. Reviewed-by: Joao
| * Make EGL a requirement for building OpenGL on QWSTom Cooksey2009-09-161-2/+2
| | | | | | | | | | | | | | Currently, QtOpenGL on QWS needs to link against an EGL library. While we'd one day like to change that, it will be that way in Qt 4.6. Reviewed-By: Paul
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-09-16529-190/+239156
| |\
| | * Fixed linking on Windows.Trond Kjernaasen2009-09-161-1/+1
| | | | | | | | | | | | Reviewed-by: Kim
| | * Doc: Made the QDockWidget::windowTitle property non-internal.David Boddie2009-09-161-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Doc: Added notes about using dock widgets and fixed some references.David Boddie2009-09-161-7/+13
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Stabilize testsOlivier Goffart2009-09-165-4/+19
| | |
| | * Don't crash on exit if the X11 clipboard owner has not been created.Bradley T. Hughes2009-09-161-1/+2
| | | | | | | | | | | | Owner can be null, don't try to deref it if it is.
| | * Remove unnecessary lines from MMP files when using libstdcppv5.dllIain2009-09-161-12/+1
| | | | | | | | | | | | | | | | | | | | | SBSv1 has also been updated to define the appropriate macros and add the required library statements, so all that is needed is the STDCPP keyword Reviewed-by: mread
| | * Fix alpha setting in Designer's "Edit Palette" windowFriedemann Kleint2009-09-163-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use QColorDialog::getColor() instead of deprecated QColorDialog::getRgba(), which causes alpha value to get lost in the process. Task-number: QT-4494 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
| | * Put back the declarativeData into its union so it doesn't take memoryOlivier Goffart2009-09-161-2/+4
| | | | | | | | | | | | | | | | | | As it was in commit 025dcc2bb Reviewed-by: Thiago
| | * Move QGuard to the ExtraDataOlivier Goffart2009-09-162-15/+15
| | | | | | | | | | | | | | | | | | | | | not every QObject need a pointer to the QGuard while none of them will usually use it (it is private API) Reviewed-by: Thiago
| | * Fix tst_QGL::openGLVersionCheck() autotest on OpenGL ES platformsTom Cooksey2009-09-161-1/+9
| | | | | | | | | | | | Reviewed-by: Trustme
| | * Make QtOpenGL on X11/EGL less chatty with it's debug outputTom Cooksey2009-09-161-5/+6
| | | | | | | | | | | | Reviewed-by: Trustme
| | * Make test pass after license header changesPaul Olav Tvete2009-09-161-3/+3
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Updating line numbers in uic3 auto-testsJoão Abecasis2009-09-1611-80/+80
| | |
| | * Document that errors from flush are ignored in QFile::close()João Abecasis2009-09-161-1/+1
| | | | | | | | | | | | Reviewed-by: Andy Shaw
| | * Fix to QSyntaxHighlighter not rehighlighting enoughmae2009-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When entire blocks get deleted, the last block for rehighlighting would be the block _before_ the deleted blocks. This is wrong, since the deleted blocks could have contained characters which affect the state. The patch lets the highlighter check for one more character. Reviewed-by: thorbjorn
| | * QFontMetrics::boundingRect(QString) returns incorrect width on Mac OS XPrasanth Ullattil2009-09-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug appears only in Carbon port (ATSUI font engine). While finding the character stops, this font engine relys on the RTL flags. As an optimization, for this particular version of boundingRect(), BIDI is ignored. So for this font engine, we will always use the correct RTL flags. Task-number: 213109 Done-with: Eskil Reviewed-by: Simon Hausmann
| | * doc: Fixed some qdoc errors.Martin Smith2009-09-165-9/+5
| | |
| | * Small optimisation in QFontMetrics multi-length-stringOlivier Goffart2009-09-161-4/+6
| | | | | | | | | | | | | | | | | | | | | Change the len instead of copying the string. Idea from Warwick Reviewed-by: Warwick Allison
| | * Implemented the SAVE_TARGET in QClipboard on X11Denis Dzyubenko2009-09-163-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for the simpliest SAVE_TARGET mechanizm allowing us to work nicely with clipboard managers, so that when Qt application that owns the clipboard exits we delegate the content to the clipboard manager if there is one. The current implementation doesn't specify which targets to give to the manager, so it will try to fetch as much as possible. Also, right now we do not support the TARGET_SIZES target, meaning that the manager doesn't know how much data it is going to fetch, so it will try to fetch everything even if it can take a lot of time. Reviewed-by: Bradley T. Hughes
| | * Added support for subpixel antialiasing on text in the GL2 engine.Kim Motoyoshi Kalland2009-09-168-24/+181
| | | | | | | | | | | | | | | | | | The antialiasing is currently not gamma corrected. Reviewed-by: Samuel
| | * Separate the copy of JavaScriptCore that QtScript uses from the copy thatSimon Hausmann2009-09-16481-1/+238766
| | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit uses. This is needed to decouple QtScript from QtWebKit, as discussed in the WebKit team. Reviewed-by: Kent Hansen
| | * qdoc: Added the "All Functions" link back into the header.Martin Smith2009-09-161-0/+2
| | |
| * | Fix QTimer overflow with interval > 35 minutes on symbianShane Kearns2009-09-163-5/+42
| |/ | | | | | | | | | | | | | | For long intervals, restart the system timer every 2000 seconds New autotest to verify long timers don't crash or complete immediately Task-number: QT-651 Reviewed-by: axis
| * Hide getStaticMetaObject() on platforms without Q_NO_DATA_RELOCATIONShane Kearns2009-09-161-2/+8
| | | | | | | | | | | | | | | | | | getStaticMetaObject() is a workaround for linkage problems on symbian platform, so it does not exist on other platforms. This change makes the forward declaration inside Q_OBJECT only present when Q_NO_DATA_RELOCATION is defined Reviewed-by: axis
| * doc: Fixed some qdoc errors.Martin Smith2009-09-161-1/+1
| |
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-16124-394/+2148
| |\
| * | Fixed glsl warnings on mac and stop using texturecoords when not neededGunnar Sletta2009-09-163-26/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The setTextureCoordsEnabled was enabled in two places, but never disabled causing it to always be used. When using a varying in a vertex shader and not using it again in the fragment shader this produces a warning, and rightly so. Since the property is 100% detectable based on the fragment shader used, move the logic into the shader selection code and kill the property all together. This should also speed up solid filling a bit...
| * | Silenced GLSL compiler warning on Mac OS XGunnar Sletta2009-09-152-1/+5
| | |
* | | Improve font handling on Mac/Cocoa.Morten Sorvig2009-09-161-0/+31
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mac/Cocoa font database currently relies on two APIs, ATSUI (old) and CoreText (new). These are interchangable and work on the same font database. Some differences do exist, in particular ATSFontFamilyGetName seems to return the same as ATSFontGetName for some fonts - the font name, not the family name. In any case, the old ATS code path is initializing QFontDatabase::familes() with the font name. This causes a naming mismatch with code that uses CoreText and gets the proper family name, in this case in initializeDb(). The fix is to make sure the correct family name is used by using the CoreText API to access it. RevBy: TrustMe
* | Reduce overhead of paint engine-specific pixmap filtersRhys Weatherley2009-09-168-38/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Engine-specific pixmap filters were being created, used, and destroyed every time draw() was called on QPixmapColorizeFilter, QPixmapBlurFilter, and so on. This had a heavy performance penalty and made it difficult for the GL paint engine to cache shaders from one request to the next. A generic filter can request an engine-specific filter that matches its parameters. The engine can either create a new one or return a previously allocated filter object. Ownership of engine-specific pixmap filter objects is moved to the paint engine itself. Reviewed-by: Andrew den Exter Reviewed-by: Michael Brasser Reviewed-by: Michael Goddard Reviewed-by: Sarah Smith
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-162-2/+18
|\ \
| * | Fix QLineEdit drag'n'dropAlan Alpert2009-09-151-1/+0
| | | | | | | | | | | | | | | | | | | | | QLineEdit shouldn't have been moving the text cursor while dragging. Task-number: 260457 Reviewed-by: mbm
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alan Alpert2009-09-15155-590/+2985
| |\ \
| * | | Fix QLineEdit::setPaletteAlan Alpert2009-09-152-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QLineControl has a separate palette that wasn't getting updated. Task-number: 261239 Reviewed-by: mbm
* | | | Fix crash in QVGSharedContext shutdownRhys Weatherley2009-09-161-0/+4
| |/ / |/| | | | | | | | | | | | | | | | | | | | The reference count was reducing down to zero during paint engine cleanup when we weren't ready to destroy the context. Artificially increase it to prevent the early context destroy. Reviewed-by: Sarah Smith
* | | Only regenerate pixmap filter source if the parameters have changed.Rhys Weatherley2009-09-151-2/+31
| | | | | | | | | | | | Reviewed-by: trustme
* | | Remove unnecessary definitions in GL pixmap filter code.Rhys Weatherley2009-09-151-5/+0
| | | | | | | | | | | | | | | | | | The code does not use QGLShader directly any more. Reviewed-by: trustme
* | | Fix glMatrixMode() arguments for desktop OpenGLRhys Weatherley2009-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | The defines are GL_MODELVIEW/GL_PROJECTION, not GL_MODELVIEW_MATRIX/etc. The _MATRIX defines are for fetching the matrix, not setting it. Reviewed-by: trustme
* | | Compilation fix for OpenGL/ES 2.0Rhys Weatherley2009-09-151-0/+2
| | | | | | | | | | | | | | | | | | Matrix functions do not exist under OpenGL/ES 2.0. Reviewed-by: trustme
* | | Export a function for getting a IDirectFBWindowAnders Bakken2009-09-154-6/+34
| | | | | | | | | | | | | | | | | | This function is only exported when DirectFB is built into QtGui. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | | Export two functions for getting a surface in dfbAnders Bakken2009-09-152-1/+14
| | | | | | | | | | | | | | | | | | | | | When building DirectFB as part of QtGui and not as a plugin this patch will export two global functions for getting a surface given a widget. Reviewed-by: Donald Carr <donald.carr@nokia.com>
generated by cgit v0.12 at 2025-09-09 09:07:34 (GMT)