summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-10-065-3/+21
|\
| * Fix auto test for QSound; find test wav file.Justin McPherson2009-10-062-2/+6
| | | | | | | | Reviewed-by: Bill King
| * Print images with colortable using their colortable in PDFGunnar Sletta2009-10-061-1/+1
| | | | | | | | Reviewed-by: Trond
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Peter Yard2009-10-065-6/+194
| |\
| * | Add documentation for WA_DontShowOnScreen.Peter Yard2009-10-061-0/+3
| | |
| * | Added QT_VERSION_CHECK to docs.Peter Yard2009-10-061-0/+11
| | |
* | | Remove incorrect statement from INSTALL file.Jason McDonald2009-10-061-3/+1
| |/ |/| | | | | | | | | | | | | The -prefix-install option is actually on by default and has no effect on any platform but Mac. Task-number: QTBUG-3029 Reviewed-by: Lincoln Ramsay
* | Add autotest for mysql savepoints.Bill King2009-10-061-0/+15
| |
* | Update documentation for setForwardOnly.Bill King2009-10-062-3/+13
| |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-10-061-17/+9
|\ \ | |/
| * Fixed QAudioDeviceInfoInternal::deviceList(QAudio::Mode mode) filteringMartin Banky2009-10-051-17/+9
| | | | | | | | | | | | | | | | | | | | If an audio device only supported Input or Output, it would not be added to the list of devices. Only devices that returned IOID == NULL would be added. Also, _m was not being used, and io was unneccessarily being cast to a QString. Merge-request: 1664 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* | Implement the drop shadow filter for OpenGLRhys Weatherley2009-10-052-3/+166
|/ | | | | Task-number: QTBUG-4583 Reviewed-by: trustme
* Stabilize tests on X11Olivier Goffart2009-10-055-21/+20
|
* Workaround for the problem with abld ignoring OPTION_REPLACEIain2009-10-051-1/+7
| | | | | | | | | abld in the S60 SDKs has a bug where OPTION_REPLACE cannot be used to remove options from the command line (ie. replace them with nothing), so this workaround introduces a macro definition (that should never be used) as a harmless replacement option. Reviewed-by: Aleksandar Sasha Babic
* Fixing Keypad Navigation on N95 devicesAlessandro Portale2009-10-051-1/+6
| | | | | | | | | HAL::Get(HALData::EPen, TInt& result) may set 'result' to 1 on some 3.1 systems (e.g. N95). But we know that S60 systems below 5.0 did not support touch. Let's use tahth knowledge and work-around that N95 HAL bug. Rev-By: Jani Hautakangas
* Symbain crash fix for QPixmap->QImage conversion.Alessandro Portale2009-10-051-1/+6
| | | | | | | | | | | In some cases the QImage, returned by QS60PixmapData::toImage() image an invalid pointer. That led to reproducable crashes on 3.1 Device and Emulator when starting a drag in the FridgeMagnets demo. Jani Hautakangas created this fix and I tested it on 3.1 Device and Emulator confirming that the crash is gone. Rev-By: Jani Hautakangas Rev-By: Alessandro Portale
* Stabilize test on X11Olivier Goffart2009-10-054-9/+8
|
* Test fix : Move the global test model to a dir that the test won't delete.Alexis Menard2009-10-051-0/+2
|
* Fix QTextEdit pageUp/Down key handling in read-only modemae2009-10-051-21/+28
| | | | | | | | | QTextControl has two independent interaction flags TextEditable and TextSelectableByKeyboard, i.e. the latter can also apply in read-only mode. This used to be handled incorrectly in QTextEdit. Reviewed-by: con
* Fix QPlainTextEdit pageUp/Down key handling in read-only modemae2009-10-051-22/+29
| | | | | | | | | QTextControl has two independent interaction flags TextEditable and TextSelectableByKeyboard, i.e. the latter can also apply in read-only mode. This used to be handled incorrectly in QPlainTextEdit. Reviewed-by: con
* OpenSSL wrapping: compile when configured with -openssl-linkedPeter Hartmann2009-10-053-8/+2
| | | | | | we were calling sk_pop_free from OpenSSL with a wrong signature. Reviewed-by: Olivier Goffart
* move doc next to implementationOswald Buddenhagen2009-10-051-23/+20
|
* Fix a compilation warning on Mac OS XBenjamin Poulain2009-10-051-1/+4
| | | | The variable updatesEnabled is not used on Mac OS X.
* Added qtextcodec_p.h to the project file.Denis Dzyubenko2009-10-051-0/+1
| | | | Reviewed-by: trustme
* Fixed inheritence of whitespace mode in QtSvg.Kim Motoyoshi Kalland2009-10-051-9/+5
| | | | | Task-number: QTBUG-4587 Reviewed-by: Tor Arne
* Fixed bug in X11 paint engine causing source pixmap depth to change.Samuel Rødal2009-10-052-0/+20
| | | | | | | | Setting a pixmap brush when painting to a 32-bit target might cause the source pixmap to be converted to 32-bit. We should detach the pixmap if we need to convert it. Reviewed-by: Trond
* use QTRY_VERIFY instead of qWait() in tst_QDialog::reject()Bradley T. Hughes2009-10-051-17/+11
| | | | | | | | | This test already uses qWaitForWindowManager(), but on X11, reshowing a dialog can take long as the window manager has to do more work before remapping the window. we should give it more time (hence the change to QTRY_VERIFY) Reviewed-by: Rohan McGovern
* Fixed a crash in menus on Symbian.axis2009-10-053-16/+19
| | | | | | | | | | | | | | | | | | | | The reason for the crash was the following: When we make menu entries in Qt, we assign each item an arbitrary command ID. This is because Symbian usually puts the items in a resource file and refers to them by ID, but we need to be dynamic. These command IDs are also assigned to cascading menu items (sub menus). When we then get a callback in RestoreMenuL with one of submenu IDs, we used to ask Symbian to construct the menu items for them, but Symbian doesn't know about them. Fixed by avoiding call into S60 code if the ID belongs to Qt. Also put a cap on the number of menu items. It's very unlikely that anyone will reach it, but it's better to have an actual check. Task: QT-646 AutoTest: Manual testing went fine RevBy: mread
* Added some comments.axis2009-10-051-1/+1
|
* Fixed indentation.axis2009-10-051-3/+3
|
* Moved non-public functions out of public header file.axis2009-10-052-8/+5
| | | | RevBy: Trust me
* Test fix on MacOlivier Goffart2009-10-053-1/+6
|
* Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-10-053-33/+2
| | | | jsc-for-qtscript-4.6-staging-05102009 ( ed678069ebd06579a26b4fb8cc944f06d6b0d55c )
* Fixed noisy looking textures in Basic Drawing example with GL2 engine.Kim Motoyoshi Kalland2009-10-051-3/+2
| | | | | | | | | | | When running the Basic Drawing example with the GL2 paint engine and antialiasing enabled, textures looked noisy. When antialiasing was enabled, the example translated the painter half a pixel to get sharp lines. This caused the textures to be sampled at texel corners. Without linear interpolation, sampling textures at texel corners is unpredictable. The fix is to not translate the painter. Reviewed-by: Gunnar
* Fix QKeySequence::DeleteEndOfWord and QKeySequence::DeleteStartOfWordmae2009-10-051-2/+4
| | | | | | | | | QTextControl showed inconsistent behaviour with DeleteEndOfWord and DeleteStartOfWord when the cursor had a selection. With this patch, the commands will simply delete the existing selection, which is consistent behaviour with in other IDEs. Reviewed-by: Simon Hausmann
* Fixes to qpixmapcache test cases, test case now adapts to cache_limit.Janne Anttila2009-10-051-9/+18
| | | | | | | | | | | | | | | | | | The default cache_limit in different platforms have different value. For example in Symbian the default is currently 1024 KB where as for desktop platforms the default is 10 MB. The purpose of modified qpixmapcache test cases was to do operations until cache_limit was reached. This was achieved by hard coded 40000 iterations. However this hard-coded value is fargile for cache limit changes, and in addition it unnecessarily made the test exectuion to take very long time on platforms which had smaller cache limit. This patch changes the test so that number of expected items to fit in cache is calculated and then 1000 extra items is tried to put in cache to make sure limit is exceeded. Reviewed-by: Alexis Menard
* doc: fix two errors in statemachine snippetsKent Hansen2009-10-051-2/+2
|
* Stopped using bitfields for S60 and Symbian versions.axis2009-10-051-8/+8
| | | | | | | | There is no reason for it, since they will never overlap. Left a little space between numbers in case of patch releases. RevBy: Iain
* QAbstractItemView: Make sure the view is updated when a delegate is set.Olivier Goffart2009-10-052-4/+7
| | | | | | | The test tst_QListView::task254449_draggingItemToNegativeCoordinates was failing in cocoa because of this. (on, cocoa, the call to show was doing the first paintEvent) Reviewed-by: Thierry
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-10-0562-514/+1403
|\
| * Fixed pixeldust in translucent toplevel proxy widgets on MacGunnar Sletta2009-10-051-2/+3
| | | | | | | | Reviewed-by: Bjoern Erik Nilsen
| * Updated JavaScriptCore from /home/khansen/dev/qtwebkit to ↵Kent Hansen2009-10-0551-495/+1347
| | | | | | | | | | | | jsc-for-qtscript-4.6-staging-05102009 ( 38c2b17366f24220d9ae0456a7cfe2ac78a9f91c ) Adapt src/script to src/3rdparty/javascriptcore changes
| * Document Embedded Linux with X11 and Scratchbox environment as Tier 2.Volker Hilsheimer2009-10-051-0/+2
| |
| * Doc: move new files into correct subdirectory.Volker Hilsheimer2009-10-053-1/+1
| |
| * Fix whatsThis breakage when using custom style sheet fontJens Bache-Wiig2009-09-142-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | When setting a large font using style sheets, the whats this popup size calculation would be incorrect resulting in half visible lables. By calling ensurePolished before showing the label, we ensure that this will be properly handled. We also added a new test case for whatsThis in tst_qtooltip Task-number: QTBUG-2416 Reviewed-by: ogoffart
| * Update self-signed certificate for Symbian, since the old one expiredIain2009-10-051-8/+10
| | | | | | | | | | | | | | | | | | New certificate for using for self-signing. Updated some organisational details, gave this one a 10 year validity rather than a 1 year validity. Same private key as before. Reviewed-by: axis
| * Improved performance in raster window surface for 16-bit displays.Samuel Rødal2009-10-051-2/+5
| | | | | | | | | | | | | | | | Greatly improves performance in flush() for the non-MITSHM case on 16-bit displays. Instead of converting the whole image to a pixmap only convert the sub-rect that's needed. Reviewed-by: Gunnar
| * Made X11 pixmap backend's fromImage() check for Qt::NoOpaqueDetection.Samuel Rødal2009-10-051-2/+9
| | | | | | | | Reviewed-by: Gunnar
| * Fix compilation on Solaris.Thiago Macieira2009-10-051-3/+3
| | | | | | | | | | | | No semi-colons allowed after Q_PROPERTY. Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-10-0531-682/+205
|\ \ | |/