summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove distinction between different editions in docs.Jason McDonald2009-09-224-26/+5
| | | | | | | We now generate only one set of docs, for the qt-everywhere package. Thus we no longer need to differentiate the different editions. Reviewed-by: Trust Me
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-223-1/+15
|\
| * Add reconnection option to the mysql driver.Bill King2009-09-222-0/+14
| | | | | | | | | | | | adds MYSQL_OPT_RECONNECT to the mysql driver options. Task-number: QTBUG-4510
| * Make compileBill King2009-09-221-1/+1
| |
* | QMatrix4x4::mapVector() to transform by top-left 3x3Rhys Weatherley2009-09-223-1/+94
|/ | | | | | | | It is useful to be able to map direction vectors by the top-left 3x3 component of a 4x4 matrix, ignoring the translation and projection components. Reviewed-by: Sarah Smith
* Revert "Resubmit support for subpixel antialiasing on text in the GL2 engine."Rhys Weatherley2009-09-218-186/+25
| | | | This reverts commit 1b34feacef7a2d3ac005449a7cfbcb08a6bbf947.
* Calculate scissor correctly in OpenVG engineRhys Weatherley2009-09-211-1/+1
| | | | Reviewed-by: trustme
* fontconfig config.test requires freetype2Harald Fernengel2009-09-211-3/+3
| | | | | | | when cross compiling, freetype2 include pathes were not used when compiling the fontconfig config.test. Fixed. Reviewed-by: Simon Hausmann
* The firstTimeObserver is not released if the event loop is never runBenjamin Poulain2009-09-212-8/+11
| | | | | | | Previously, the firstTimeObserver was released by the event loop. This do not work if the event loop is never run. This commit amend b0016ea9a6b225757e3ee06b50e8f7d05463ddf7.
* Add some more debugging to this test.Rohan McGovern2009-09-211-1/+1
|
* Removing needless qWaits and replacing others with QTRY_VERIFYsJoão Abecasis2009-09-211-21/+30
| | | | For more dependable test results.
* Letting the xmlpatternsvalidator tool properly handle relative pathsJoão Abecasis2009-09-211-45/+42
| | | | | | | | | | Since QXmlSchemaValidator resolves relative paths against the executable location, we use QUrl::fromLocalFile before passing them along. This is a more typical behavior for command-line applications and fixes the autotest. Reviewed-by: Frans Englich
* Clean upJoão Abecasis2009-09-213-6/+0
|
* Fixing some compilation warnings in xml testsJoão Abecasis2009-09-213-3/+3
| | | | Reviewed-by: Peter Hartmann
* CompilePaul Olav Tvete2009-09-211-1/+1
| | | | Reviewed-by: aportale
* Fix autotest compilationOlivier Goffart2009-09-211-1/+0
|
* Optimized GL2 engine to use scissor clipping more aggressively.Samuel Rødal2009-09-213-96/+255
| | | | | | | | | | | | | | | | There's no reason to stop using a scissor clip when a more complex clip is set. Instead, we can use a combination of scissoring and depth clipping to represent the final clip. When intersecting with a new clip path, if the clip path is a rectangle we simply intersect it against the scissor clip, and otherwise we intersect its bounding rect against the scissor clip and write the actual path to the depth buffer. The patch simplifies the logic in clip() quite a bit, except in the UniteClip case in which we don't care about performance anyways. It also fixes a bug which could cause rendering errors if the stencil buffer contains junk before painting. Reviewed-by: Gunnar Sletta
* Made hellogl example compile when GL_MULTISAMPLE is not defined.Samuel Rødal2009-09-211-1/+5
| | | | | | | Also let the GL widget have sample buffers, otherwise using GL_MULTISAMPLE won't help much. Reviewed-by: Trond
* Made subpixel antialiasing in the GL2 engine work on X11 as well.Samuel Rødal2009-09-212-0/+23
| | | | | | Need to add alphaRGBMapForGlyph to the Freetype font engine. Reviewed-by: Kim
* QtScript: Fix comparing QVariant and QObject.Olivier Goffart2009-09-219-3/+90
| | | | | | | This add a hook inside JSC to be able to implement our own comparison function when comparing objects. Reviewed-by: Kent Hansen
* Resubmit support for subpixel antialiasing on text in the GL2 engine.Kim Motoyoshi Kalland2009-09-218-25/+186
| | | | | | | The antialiasing is currently not gamma corrected and is disabled on OpenGL ES 2.0. Reviewed-by: Samuel
* When using Plastique style, changing the background style sheet property of aGabriel de Dietrich2009-09-213-1/+55
| | | | | | | | spinbox wouldn't set the correct background for the embedded line edit. Reviewed-by: Olivier Task-number: 232085 Task-number: QTBUG-3013
* Doc: Indicated that press and release events occur with double clicks.David Boddie2009-09-211-5/+7
| | | | | Task-number: 255118 Reviewed-by: Trust Me
* Doc: Tidied up the QDesktopWidget documentation.David Boddie2009-09-211-28/+47
| | | | Reviewed-by: Trust Me
* Doc: Exclude the Q_CORE_EXPORT_INLINE declaration from the docs.David Boddie2009-09-211-0/+1
| | | | Reviewed-by: Trust Me
* qdoc: Reverting 4.6 to %VERSION%.Martin Smith2009-09-211-1/+1
|
* qdoc: Added \brief texts to all the since 4.6 functions.Martin Smith2009-09-2111-21/+59
|
* Fix printing with glyph substitutionEskil Abrahamsen Blomfeldt2009-09-211-0/+5
| | | | | | | | | | | | | | If a font has substituted any of the glyphs in the string, then we cannot convert it to a string, as the glyph positions will no longer match the positions of the characters. E.g. in the case of the MS Calibri font, two subsequent t's are represented by a single glyph. Printing text in Calibri with subsequent t's will thus cause the first t to be position and sized based on the glyph representing "tt" and glyphs after this to be position based on the wrong advance and the text will look mangled, with some glyphs overlapping. Task-number: QTBUG-4445 Reviewed-by: Gunnar
* Fixed a warning.Trond Kjernaasen2009-09-211-1/+1
| | | | Reviewed-by: Trust Me
* Corrected license header in /tools/xmlpatternsvalidator/main.h.Kim Motoyoshi Kalland2009-09-211-1/+1
| | | | Reviewed-by: Trustme
* Removed empty line before the license header in qdesigner_utils_p.h.Kim Motoyoshi Kalland2009-09-211-1/+0
| | | | Reviewed-by: Trustme
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Andy Shaw2009-09-219-32/+60
|\
| * Fixed license headers in /util/qlalr.Kim Motoyoshi Kalland2009-09-218-8/+8
| | | | | | | | Reviewed-by: Trond
| * Improved license header autotest.Kim Motoyoshi Kalland2009-09-211-24/+52
| | | | | | | | | | | | | | | | | | | | Check the license in .h files as well as .cpp files and check some files that were previously skipped. Instead of scanning through the whole Qt directory for .cpp and .h files, only search through a set of subdirectories. Accept '\r' as line break in addition to '\n' and "\r\n". Reenable the copyright check that was commented out. Reviewed-by: Frans Englich
* | Ensure that the menu only shows when clicking on the menu buttonAndy Shaw2009-09-212-1/+57
|/ | | | | | | | | | | | | In Qt 3 clicking on the toolbutton would not popup the menu, only when clicking on the arrow for the menu popup would this appear if the toolbutton had MenuPopup mode set. When a Q3ActionGroup is used and added to a toolbar then it will give a toolbutton with such a button. This patch fixes the behaviour so that only clicking on the arrow button will cause the menu to appear in this mode. Reviewed-by: Thierry
* Fix signal/slot connection bugRichard Moe Gustavsen2009-09-211-7/+2
| | | | | | A signal was renamed. Update the example to reflect this. Rev-By: Trustme. Example fix only.
* Refactored gl window surface a bit.Gunnar Sletta2009-09-211-37/+43
| | | | | | | | | | | | The logic was a bit messy and didn't work on Mac OS X. On Linux we also had issues with 8xxx nvidia cards which didn't render properly. The FBO is now unbound between calls to beginPaint(), which prevents other gl calls from messing it up, which is probably what was the error in the first place. In addition, on Mac OS X, we also call the upatePaintDevice() as a result of setGeometry() to force-update the dimensions of the context. Reviewed-by: Trond
* Fix QPrintDialog with no parent and no active windowEskil Abrahamsen Blomfeldt2009-09-211-2/+6
| | | | | | | | | | | | PrintDlgEx requires an non-null owner handle, otherwise it will fail with an "Invalid Handle" error. This caused code which popped up a print dialog as the only window in the application to fail silently and immediately return Rejected from the exec() function. To continue support for this somewhat unusual use case, we fall back to using the print dialog itself as the owner of the print dialog sheet if all else fails. Reviewed-by: Trond
* Demo browser: Enable DNS prefetchingMarkus Goetz2009-09-211-0/+2
| | | | Reviewed-by: TrustMe
* On Mac, the posted events are processed on the first time in the loopBenjamin Poulain2009-09-213-15/+64
| | | | | | | | | | | | | | | | On Mac OS X, we use a custom source for posted events. The first time the event loop is entered, the custom source is added to the native event dispatcher but the events are not processed. In Qt, we expect those events to be processed. To work around the problem, a new observer is added to the event loop. This observer is only triggered the first time the event loop is entered. When the observer is triggered, the posted events are sent. Task-number: QTBUG-4521 Reviewed-by: Richard Moe Gustavsen Reviewed-by: João Abecasis
* use JSObject::inherits() instead of JSObject::isObject()Kent Hansen2009-09-216-15/+15
| | | | | | The functions are identical, but in recent WebKit trunk isObject() doesn't exist anymore. So this renaming is done to prepare for the import of a more recent JavaScriptCore.
* Update recommendation for make command to run after configure for SymbianIain2009-09-212-1/+1
| | | | | | | | | | | The makefile written for calling the Symbian build tools is for GNU make not nmake, so print an accurate message when -xplatform is symbian-<whatever> We still don't make the correct recommendation for the confclean target but that doesn't work anyway (see QTBUG-4536) Reviewed-by: Jason Barron
* qdoc: Added "since" 4.6 lists to the "What's New" page.Martin Smith2009-09-217-8/+87
| | | | In test/qt.qdocconf, change %VERSION% to 4.6, for example.
* Compile fix for non-Symbian.Alessandro Portale2009-09-211-1/+1
| | | | | | updateSoftKeys_sys() is now a member of QSoftKeyManagerPrivate Reviewed-by: Jason Barron
* Make the 'softkeys' example compile again after softkey changes.Jason Barron2009-09-211-6/+3
| | | | | | | Change to the new API and remove one of the actions since it has no equivalent in the new framework. Reviewed-by: Alessandro Portale
* Get menubars working again with new softkey API.Jason Barron2009-09-212-1/+4
| | | | | | | | | | | | | | | | This is an unfortunate workaround to get the menu bars working again. Previously we used the soft key role to determine what action command we should use for the softkey. Now we only use the role to determine the position (as we should) and ideally the command would be determined by checking if the action has a menu() and then forcing the command to EAknSoftkeyOptions. This would have enabled any softkey with a menu to work, but unfortunately this would require considerable effort in the menu implementation and time is short. So the workaround is to abuse object name to tell the softkey system that this key is special and should get EAknSoftkeyOptions. Reviewed-by: Alessandro Portale
* Introduce MenuSoftKey as a standard key to the internal enum.Jason Barron2009-09-213-1/+6
| | | | | | | | QMainWindow was using the 'Done' standard softkey to represent the action for the menu bar, but that was obviously wrong and pointed out that one of hte needed standard softkeys was needed. Reviewed-by: Alessandro Portale
* Introduce a d-pointer to QSoftKeyManager.Jason Barron2009-09-212-18/+31
| | | | | | | | Originally this was supposed to be a mostly static API, but now it looks like some more non-static members will be needed so introduce a d-pointer to store them. Reviewed-by: Alessandro Portale
* Add a new compressable event QEvent::UpdateSoftKeys.Jason Barron2009-09-217-25/+183
| | | | | | | | | | | Now that the softkey framework triggers updates on focus changed, window activated, and action added/removed/changed the softkey bar was updating many times resulting in flicker. Solve that by introducing a new event type that is posted to the softkey framework. Since we only need to update the softkeys once per event loop iteration, the event is compressible in the event loop. Reviewed-by: Alessandro Portale
* Simplify the soft key roles of QAction.Jason Barron2009-09-2112-107/+78
| | | | | | | | | | | | | | | | | | | | | | | Previously there were many options here that were inherited from the Qtopia implementation. It was not clear to developers which value they actually should use. A good example was the 'Next' value. In a typical wizard application, next would be on the right and 'Previous' would be on the left. However, it is also common to have 'Next' on the left and have 'Cancel' on the right. Basically what people really wanted was a way to explicitly set the right and left soft keys, but since this relies on form factor and is wrong if the screen is rotated, we choose positive and negative actions as the values for these such that they still make sense when the screen is rotated. Also this helps people who don't know if a particular action should be on the left or right, but they *do* know if their action has destructive characterisitics (negative). As a convenience for widgets in Qt that use softkeys, we create a standard softkey enumeration. That maps the actions to the correct role and has default text. Reviewed-by: Alessandro Portale