summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64Thiago Macieira2010-05-2135-0/+278008
|
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-211-1/+21
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: changes-4.6.3 updated
| * changes-4.6.3 updatedJoerg Bornemann2010-05-211-1/+21
| |
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-212-1/+5
|\ \ | |/ |/| | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing the compile issue. Fixing the compile issue.
| * Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-1/+1
| | | | | | | | | | Private headers have to be included in consistent and proper way: not like "name_p.h" or "../name_p.h" but <private/name_p.h>
| * Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-0/+4
| | | | | | | | | | | | | | | | We have to explicitely specify the include path to the MW headers for Symbian. The compiler always gets confused if the private headers get in the way. Reviewed-by: TrustMe
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Typo.
| * | Typo.Trond Kjernåsen2010-05-211-1/+1
| | |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-213-13/+71
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Removed nearest test from qaudiodeviceinfo unit test. QAudioDeviceInfo::nearestFormat() consistent across all platforms The documentation for processedUSecs() is ambiguous
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-05-217-16/+140
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-202-2/+71
| | |\ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioDeviceInfo::nearestFormat() consistent across all platforms The documentation for processedUSecs() is ambiguous
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-202-2/+71
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioDeviceInfo::nearestFormat() consistent across all platforms The documentation for processedUSecs() is ambiguous
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-202-2/+71
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioDeviceInfo::nearestFormat() consistent across all platforms The documentation for processedUSecs() is ambiguous
| | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-192-2/+71
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioDeviceInfo::nearestFormat() consistent across all platforms The documentation for processedUSecs() is ambiguous
* | | | | \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-201-9/+81
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes.
| * | | | | | My 4.6.3 changes.Trond Kjernåsen2010-05-201-16/+73
| | | | | | |
| * | | | | | Added my 4.6.3 changes.Kim Motoyoshi Kalland2010-05-201-1/+4
| | | | | | |
| * | | | | | My 4.6.3 changes.Samuel Rødal2010-05-201-0/+12
| | | | | | |
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-201-2/+19
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add my 4.6.3 changes
| * | | | | Add my 4.6.3 changesKent Hansen2010-05-201-2/+19
|/ / / / /
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-203-9/+43
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3
| * | | | Fix WebKit version dependency in pkg filesSimon Hausmann2010-05-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the Qt major/minor/patch version for WebKit, but use them only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is read by qt.prf Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| * | | | Add support for including module specific .pri files as part of qt.prf handlingSimon Hausmann2010-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| * | | | My changelog entries for 4.6.3Denis Dzyubenko2010-05-201-2/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | | Add my changes to the 4.6.3 changes logEskil Abrahamsen Blomfeldt2010-05-201-2/+14
| | | | |
| * | | | my changelog for 4.6.3Peter Hartmann2010-05-201-4/+9
| | |/ / | |/| |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-201-2/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Switch Symbian^3 QCursor implementation back to 5.0 way
| * | | Switch Symbian^3 QCursor implementation back to 5.0 wayShane Kearns2010-05-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The window server bug with pointer cursors may not have been fixed, in any case enabling pointer cursors on Symbian^3 requires WriteSystemData capability which isn't available to all applications. This change fixes the "qt_s60_setWindowGroupCursor - null handle" warnings when using the touch screen. Tested with QCursor manual test (tst_allcursors) Reviewed-by: Sami Merila
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-193-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix qmake -project once more
| * | | | fix qmake -project once moreOswald Buddenhagen2010-05-183-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default_pre.prf adds "uic" and "resources" to CONFIG, but not "qt". as a consequence, the former do not find qtPrepareTool(), as nobody includes qt_functions.prf if no qmake spec is loaded. Reviewed-by: joerg
| | | * | Removed nearest test from qaudiodeviceinfo unit test.Kurt Korbatits2010-05-201-11/+0
| | | |/ | | | | | | | | | | | | Reviewed-by:Justin McPherson
| | | * QAudioDeviceInfo::nearestFormat() consistent across all platformsKurt Korbatits2010-05-191-1/+61
| | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-10760 Reviewed-by:Justin McPherson
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-05-1924-79/+155
| | | |\ | |_|_|/ |/| | |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-191-3/+27
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed tst_compilerwarnings test failure due to icecc node failures.
| * | | Fixed tst_compilerwarnings test failure due to icecc node failures.Rohan McGovern2010-05-191-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an icecc node has some system error, icecc on the client side outputs a warning. Since it's able to recover and the warning has nothing to do with the code, we should ignore it. Other distributed compile tools will have similar issues, but no attempt has been made to cover them.
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-181-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Remove dead code
| * | | | QNAM HTTP: Remove dead codeMarkus Goetz2010-05-181-2/+0
| | | | |
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-173-12/+30
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: fix typo QCompleter: fix misuse of QMap that can lead to crashes qmake: added possibility to specify the type of an install target
| * | | | Doc: fix typoOlivier Goffart2010-05-171-1/+1
| | | | |
| * | | | QCompleter: fix misuse of QMap that can lead to crashesOlivier Goffart2010-05-171-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch providedin the task. Task-number: QTBUG-8407
| * | | | qmake: added possibility to specify the type of an install targetJoerg Bornemann2010-05-172-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change: target.CONFIG+=no_check_exist implies the file is a file, no way to make an install rule for a non-existing directory. Now, its possible to specify the type: target.CONFIG+=no_check_exist directory will install a directory. target.CONFIG+=no_check_exist executable will install an executable. target.CONFIG+=no_check_exist data will install a normal file. The default case, if no type is given, like in CONFIG+=no_check_exist will call QFileInfo::isExecutable() to determine, if its a data file or executable. This is the old behaviour. Task-number: QTBUG-10624 Reviewed-by: ossi
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-172-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: re-add overriding of tool paths to configure
| * | | | | re-add overriding of tool paths to configureOswald Buddenhagen2010-05-172-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unlike originally planned, we didn't remove the setting of the tool paths from the qmake specs - for compat reasons. however, that means that they will make the QT_BUILD_TREE handling in qtPrepareTool ineffective, which meant that the qt build would try to use the tools from an installed qt ...
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-144-9/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support linked fonts (.ltt) from standard font locations. QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike Fix anomaly demo control strip icon placement
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-144-9/+19
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support linked fonts (.ltt) from standard font locations. QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike Fix anomaly demo control strip icon placement
| * | | | | Support linked fonts (.ltt) from standard font locations.Alessandro Portale2010-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal font database was only populated with .ttf and .ccc files. This patch adds .ltt as file type. Without complete font type coverage in the fontstore, we may get a mismatch in the internal association of font table and fontfamily. Most probably, this will also fix the crash on SSE Satio's. SSE seems to use .ltt files already on S60 5.0. An improvement needs to be verified by an owner of such a device, however. Task-number: QTBUG-8905 Reviewed-by: Aleksandar Sasha Babic
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-143-9/+18
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike Fix anomaly demo control strip icon placement
| | * | | | QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelikeSami Merila2010-05-142-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently style defines QStyle::SH_ItemView_ActivateItemOnSingleClick, which leads to itemview item activation only occur on double-click (or tap). The item selection work native-like on Sym^3. As a correction, style needs to check the passed styleoption and check whether or not the state "Selected" is on. In these cases, the itemactivation can proceed. Task-number: QTBUG-10697 Reviewed-by: Miikka Heikkinen
| | * | | | Fix anomaly demo control strip icon placementMiikka Heikkinen2010-05-141-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some icons overlapped in very small screens, so make icon placement little bit smarter. Task-number: QTBUG-10635 Reviewed-by: Janne Anttila
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-1416-52/+43
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix regexp fix path separators in install targets for MinGW+sh fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec define qtPrepareTool() function and use it throughout QNAM HTTP: And one more testcase QNetworkAccessManager: Backends were tried in wrong order
generated by cgit v0.12 at 2024-10-25 20:20:21 (GMT)