summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Testing 'dictionary' if it contains a value before using operator[].Alessandro Portale2009-05-191-2/+2
| | | | | | | | | T & QMap::operator[]: "If the map contains no item with key key, the function inserts a default-constructed value into the map with key key, and returns a reference to it" How many occurences of 'dictionary["foo"].startsWith("bar")' has that file by the way?
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-05-1911-40/+78
|\ | | | | | | softkeys
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-19178-13683/+2450
| |\
| | * S60Style: Styling QDial.Sami Merilä2009-05-191-17/+35
| | |
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAleksandar Sasha Babic2009-05-195-16/+30
| | |\
| | | * Unbreak build, spotted by various people. Not tested, but should work(TM).Frans Englich2009-05-191-1/+1
| | | |
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-192-2/+9
| | | |\
| | | * | fixed bug where pointer down outside modal dialog causes access violationJanne Koskinen2009-05-192-15/+26
| | | | |
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-181-1/+2
| | | |\ \
| | | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-18170-13568/+2099
| | | |\ \ \
| | | * | | | modified qiodevice benchmark dataset to be smaller on SymbianJanne Koskinen2009-05-152-0/+3
| | | | | | |
| | * | | | | This lines are not needed as we monitor events in exception fd_setAleksandar Sasha Babic2009-05-191-2/+0
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | and map them to read / write notifications.
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAleksandar Sasha Babic2009-05-18165-13484/+1988
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Second attempt at enabling Phonon.Frans Englich2009-05-181-1/+2
| | | | |/ | | | |/| | | | | | | | | | | Reviewed-by: Janne Koskinen
| | * | | Performance on Symbian with Open C 1.5.3 pre-releaseAleksandar Sasha Babic2009-05-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is bad and I needed some progress display to see if test is alive or not. I print line every 500 iteration.
| | * | | Testing on symbina requires more time.Aleksandar Sasha Babic2009-05-181-1/+1
| | | | |
| | * | | Our ftp server removes windiws line ending.Aleksandar Sasha Babic2009-05-181-1/+3
| | | | |
| * | | | Importing macros for testlib did not get defined properly for RVCT.Miikka Heikkinen2009-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | RevBy: axis
* | | | | experiment with QMainWindowMarkku Luukkainen2009-05-191-0/+2
| | | | |
* | | | | Changed stylesheets example to create softkeystack. This commitMarkku Luukkainen2009-05-191-0/+3
| | | | | | | | | | | | | | | | | | | | should probably be reverted before merging to master
* | | | | First hacky approach to context menus. This was commited so stuffMarkku Luukkainen2009-05-192-7/+42
| | | | | | | | | | | | | | | | | | | | | | | | | relied on context menus can be implemented concurrently while making the internals of context menu implementation cleaner.
* | | | | added Q_OBJECT macroMarkku Luukkainen2009-05-191-0/+1
| | | | |
* | | | | Merge branch 'master' into softkeysaxis2009-05-18164-13483/+1986
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-18160-13482/+1970
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/kernel/qcoreapplication.cpp Configure.exe not rebuilt because the changes are irrelevant for the S60 port. We'll rebuild it before merging back.
| | * | | | Fixed the SVG parser to handle CSS properties with multiple values.Trond Kjernåsen2009-05-181-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS properties with more than 1 value was ignored. E.g. the 'stroke-dasharray' attribute is specified by a comma separates list of numbers. This was previously ignored because the CSS parser split it into a value array. Task-number: 253614 Reviewed-by: Kim
| | * | | | Wrote Designer/uic changelog for 4.5.2.Friedemann Kleint2009-05-181-2/+13
| | | | | |
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Friedemann Kleint2009-05-181-7/+33
| | |\ \ \ \
| | | * | | | Fix QSoundServer on Big-Endian machines.Tom Cooksey2009-05-181-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 253619 Reviewed-by: Paul
| | * | | | | Fixed a bug caused by forms with a sizepolicy of 'Fixed' on the main container.Friedemann Kleint2009-05-182-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore 4.4 behaviour by using a QStackedLayout as the layout containing the actual form (as was in 4.4). The difference in behaviour was caused by insertion of an additional widget with a QVBoxLayout which is supposed to ease setting of inheritable properties (style, etc). Reviewed-by: Kai Köhne <kai.koehne@nokia.com> Task-number: 253236
| | * | | | | Made it possible to set string properties using ↵Friedemann Kleint2009-05-181-0/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesignerFormWindowCursor::setProperty. Ensure the text does not get clobbered by the subproperty handling. Reviewed-by: Kai Köhne <kai.koehne@nokia.com> Task-number: 253278
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Friedemann Kleint2009-05-181-3/+5
| | |\ \ \ \
| | | * | | | Fixed a bug which implicitly closed perspective transformed poly lines.Trond Kjernåsen2009-05-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the end point of a line in a path is clipped, only closed paths should have the closing line. Task-number: 253663 Reviewed-by: Samuel
| | * | | | | Updated German translations for 4.5.2Friedemann Kleint2009-05-1810-299/+300
| | |/ / / /
| | * | | | Adapted uic test-baseline to the icon generation change 251248)Friedemann Kleint2009-05-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: 251248
| | * | | | Initialize variable to avoid valgrind error.Frans Englich2009-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason it's only sometimes hit and cannot be deterministically reproduced. Task-number: 253722 Reviewed-by: TrustMe
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-15253-13774/+2753
| | |\ \ \ \
| | | * | | | Cocoa: Window flickers when resized with a QTabWidgetRichard Moe Gustavsen2009-05-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like we were not using the correct functions for setting the max/min size on a cocoa window. The version we used before included the unified toolbar, which is wrong. The new one does not. Task-number: 252642 Reviewed-by: Trenton Schulz
| | | * | | | HTTP authentication: return error if authentication cannot be handledPeter Hartmann2009-05-152-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return error upon receiving an unknown authentication method (e.g. WSSE); before we were just silently returning. Reviewed-by: Thiago Macieira
| | | * | | | Cleaning bug in custom layout example.Morten Engvoldsen2009-05-152-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was using deleteAllItems() to delete items from the layout. This method is now part of the QT3_SUPPORT and shold not be used if not needed. Replaced by deleting all items one by one. Task-number: 220656 Rev-by: janarve
| | | * | | | Fix syntax error in demos.pro.Jason McDonald2009-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Lincoln Ramsay
| | | * | | | QColor::toCmyk() does not convert the color if it is already in CMYKBenjamin Poulain2009-05-142-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QColor::toCmyk() converted the color to RGB and then to CMYK. If the color was already in CMYK, this conversion change it. The color is now returned directly if it is in CMYK Reviewed-by: Ariya Task-number: 253625
| | | * | | | Fixed an issue with text drawing under Windows.Trond Kjernaasen2009-05-142-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some text drawn with OpenType fonts where cut off by a pixel or two under certain circumstances. This adds an additional 2 pixel pad margin to the glyph cache entries. The padding behaves slightly different when ClearType is enabled/disabled, hence the general 2 pixel padding. Task-number: 246196 Reviewed-by: Samuel
| | | * | | | Compile.Norwegian Rock Cat2009-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need the proper types. Reviewed-by: Andy
| | | * | | | Use isNull() for strings instead of comparing against QString().Jesper Thomschütz2009-05-145-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network Reviewed-by: Samuel
| | | * | | | Fixed regression that prevented any widget from having focus when graphics ↵jasplin2009-05-141-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | view was disabled. A bug in Commit d5c018f7b014ab794e49d6e1f24e02233555847d prevented any widget from having focus when QT_NO_GRAPHICSVIEW was defined. This patch fixes the bug. Reviewed-by: bnilsen Task-number: 249589
| | | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy2009-05-144-28/+120
| | | |\ \ \ \
| | | | * | | | Fix QGraphicsItem::deviceTransform() to also work with normal items.Andreas Aardal Hanssen2009-05-144-28/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem::deviceTransform() returns the item-to-device transform, provided with the device-to-scene transform, and combining it with the item's scene transform. This function is meant to handle items that enable ItemIgnoresTransformations, but it happened to not work properly for items that _don't_ enable that flag. Unfortunately this bug is hard to work around for users from the outside, as it requires you to check if the item or any ancestor enables ItemIgnoresTransformations. The fix also removes unnecessary branchs inside QGV so that we use the same function for all items. Reviewed-by: bnilsen
| | | * | | | | Prevent duplicate entries in the sidebar when the paths are the sameAndy2009-05-142-4/+9
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If two urls were added to the sidebar that only differed in how they referenced the added url (i.e. /foo/bar/. and /foo/bar) then only one entry should appear. Task-number: 253532 Reviewed-by: Alexis
| | | * | | | Fixes build issue with WinCE and MSVC 2008 and MIPS-IIAndy2009-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Maurice
| | | * | | | Small updates to the .hgignore file.Norwegian Rock Cat2009-05-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is handy in cases where you are maybe using something like the hg-git extension in Mercurial or just storing release in Mercurial for patch queues or what have you.