summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
|\
| * 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>
| * | Fix a bug in surfaceForWidgetAnders Bakken2009-09-151-1/+2
| | | | | | | | | | | | | | | | | | I had the logic of the assert wrong with the isAncestorOf call. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Stabilize tst_QComboBox::task260974_menuItemRectangleForComboBoxPopupOlivier Goffart2009-09-151-1/+1
| | |
| * | Slightly better code for the test.Alexis Menard2009-09-151-5/+6
| | | | | | | | | | | | | | | | | | Then the test doesn't leak. Reviewed-by:ogoffart
| * | Fix macplist autotestJoão Abecasis2009-09-151-1/+0
| | | | | | | | | | | | | | | This goes to show that once a test is running no one will look at the results...
| * | Doc: Added missing files for the Designer manual.David Boddie2009-09-155-0/+0
| | | | | | | | | | | | | | | Reviewed-by: Trust Me Overcomplicated-workflow-by: Git
| * | Doc: Created a new Drawing Utility Functions page.David Boddie2009-09-152-16/+22
| | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Inspired-by: Olivier Goffart's earlier change Pain-by: Git
| * | Doc: Cleaned up the Designer main window and Embedded Linux pages.David Boddie2009-09-159-129/+223
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Increasing a timeout on QProcess testsJoão Abecasis2009-09-151-1/+1
| | | | | | | | | | | | | | | Not a proper fix, but let's see if this increases reliability of the results.
| * | I don't think this was intentional...João Abecasis2009-09-152-2/+0
| | | | | | | | | | | | | | | | | | Wonder how it survived for so long. Reviewed-by: Peter Hartmann
| * | Increased performance of blurpicker example with GL 2 engine.Samuel Rødal2009-09-151-8/+8
| | | | | | | | | | | | | | | | | | | | | Slightly increase threshold for when to shrink an FBO, and reduce the number of calls to glBindFramebuffer. Reviewed-by: Tom
| * | Fix QGraphicsView::scrollAfterResize autotest on Mac.Alexis Menard2009-09-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The auto-test was failing because it calculate the scrollbar indent using style primitives. It's very fragile and doesn't work on MacOS style (and may not work on other style too). Since we don't test style stuff here, we can just apply the plastique style for this test. Reviewed-by:TrustMe
| * | Change compile options for configure so it can be built using msvc2008Shane Kearns2009-09-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Use the -MT command line option so it links statically with libc. The reason for this is that not all windows versions have the DLL "out of the box". Reviewed-by: Marius Storm-Olsen
| * | QCursor support for Symbian OSShane Kearns2009-09-1584-176/+1719
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Jason Barron Reviewed-By: Alessandro Portale Summary: QT_NO_CURSOR is now not defined for symbian builds Existing QCursor APIs are all supported New public API, QApplication::setNavigationMode, to allow the navigation mode to be set. I.E. on an S60 3.2 phone, some applications will want a virtual mouse cursor (web browser), while others are designed for keypad navigation. Symbian HAL is used for detecting input capabilities. Fix DND, code cleanup & comment QCursor visibility now uses a refcount, and is called from DND and the setNavigationMode so they are both simpler and don't interfere with each other. QApplication::setNavigationMode New public API for configuring cursor/keypad navi style. This links in with ongoing work on the 4-way keypad navi branch, but 2-way and 4-way modes both act as 2-way mode until that is integrated Some of the demos/examples have cursor switched on (those that were not usable with keypad) Virtual mouse support for non touch, non mouse phones (tested on N78) add *.d and .metadata (carbide debug file / workspace dir) to .gitignore System pointers are unavailable when using sprite workaround, so the system cursor shapes are compiled into qtgui as resources. MAC port does this also for shapes that aren't standard on the MAC. Refactor Drag'n'Drop to use QCursor Add test case to check all system cursor shapes Simply a mainwindow containing a label widget for each cursor shape, with the cursor property set appropriately QCursor(QBitmap,QBitmap) supported Fixed problem with the image & mask being inverted when using the QCursor constructor that takes two mono bitmaps. add .make.cache files to .gitignore Correct implementation of QApplication::setOverrideCursor QApplication::restoreOverrideCursor and QApplication::setOverrideCursor are now working correctly on Symbian platform. Performance will be slower compared with other platforms, because the Symbian window server has a cursor associated with each native window. Add test case for custom cursors Create a pixmap cursor and associate it with a widget. No changes to production code, since test passed 1st time ;) Add manual test for QCursor Make cursor independent of construction order Updated to work around window server issue where contruction order affects what cursor is displayed in child windows. Also changed to effectiveWinId following review comments Also fixed a problem which would make qcursor not link if configured with QT_NO_CURSOR Moved some multiply declared extern functions from cpp to _p.h files Implemented Symbian versions of the cursor functions. Merged in work I'd done based on tower. Fill in bits of stub functions based on windows port Removed QT_NO_CURSOR from list of config options forced on symbian Recompiled configure.exe Added stub functions for the missing functions in s60 port
* | | 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
|/ /
* | Make the scrollUpdate test function work.Jan-Arve Sæther2009-09-151-1/+1
| | | | | | | | | | | | We could sometimes have more than two paint events even before reaching QTRY_COMPARE, thus it would fail. The test failed on Windows.
* | Fix a bug in FocusScopes; ensure subFocus is set correctly.Andreas Aardal Hanssen2009-09-152-1/+19
| | | | | | | | | | | | | | | | The bug was triggered by setting focus on a parent scope (which then passes focus to the innermost scope). Subfocus was set up for the first scope, but not the inner scopes. Reviewed-by: TrustMe
* | Remove unused signal declaration.Andreas Aardal Hanssen2009-09-151-1/+0
| | | | | | | | | | | | | | This came in with change c8bf9bd17a4520eefe4306b7b1bb4f93fb296d80, by accident - it was a leftover after debugging. Reviewed-by: Martin Smith
* | Removed a debug output that was a bit annoyingThorbjørn Lindeijer2009-09-151-2/+1
| | | | | | | | Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | doc: Fixed some qdoc errors.Martin Smith2009-09-152-22/+22
| |
* | When parsing a java file do not simply ignore the first character.Jan-Arve Sæther2009-09-151-1/+0
| | | | | | | | | | | | | | | | If the file started with a comment (/* .. */) the parser would not see the first '/' character, thus it would not treat it as a comment. This was because we called getChar() just before we called parse(), and just after we had entered parse().
* | Fix linenumbers.Jan-Arve Sæther2009-09-152-3/+3
| |
* | Removed GL1 pixmap filters and ported colorize filter to GL2 engine.Samuel Rødal2009-09-153-61/+22
| | | | | | | | | | | | | | | | The GL1 engine will use the raster fall back for pixmap filters. We anyhow use GLSL for the filters, which requires OpenGL 2 support, and in that case the GL2 engine is the default. Reviewed-by: Gunnar Sletta
* | QNativeSocketEngine on Windows: don't bail out on non-fatal errorPeter Hartmann2009-09-151-3/+9
| | | | | | | | | | | | | | | | receiving the WSAEMSGSIZE error means we could not read all the data because the buffer was too small, but still we should return the number of bytes read and not return -1 Reviewed-by: Marius Storm-Olsen
* | Don't do pixel tests in QGraphicsEffect on other than 32-bit display.Ariya Hidayat2009-09-151-0/+11
| | | | | | | | Reviewed-by: Paul Olav Tvete
* | Fix ambiguous overload for QTileRules constructorOlivier Goffart2009-09-153-3/+7
| | | | | | | | | | | | Also fix the relations in the documentation Reviewed-by: David Boddie