summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-215-5/+51
|\ | | | | | | | | | | Conflicts: configure src/sql/drivers/drivers.pri
| * Added automatic sqlite extraction for Symbian to QtWebKit.axis2010-07-211-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Also added sqlite detection in case sqlite is not present in the SDK. This is possible if WebKit is compiled standalone. The inclusion part is a consequence of commit c578c6c1d6d in the Qt repository. It will not work on Qt versions < 4.7.1, but that is ok, since the only build system it will affect is marked as experimental in the whole 4.7 series. RevBy: Kenneth Rohde Christiansen Task: https://bugs.webkit.org/show_bug.cgi?id=42744
| * Fixed automatic sqlite extraction on Symbian makefile build system.axis2010-07-213-1/+41
| | | | | | | | | | | | | | | | Since we cannot extract to the epocroot (it is considered R/O), we extract the header and the dso to the temporary build directories and include them from there. RevBy: Trust me
| * Fixed QT_NO_FREETYPE define.axis2010-07-211-2/+0
| | | | | | | | | | | | | | This define is also used by the OpenVG module, and therefore needs to be defined everywhere. RevBy: Jason Barron
* | Added missing header to qstring.cpp.axis2010-07-211-0/+4
| |
* | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-201-29/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tools/qtestlib/chart/database.cpp tools/qtestlib/chart/database.h tools/qtestlib/chart/reportgenerator.cpp tools/qtestlib/chart/reportgenerator.h
| * | Revert "Add the chart utility from qtestlib-tools."Rohan McGovern2010-07-201-29/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 453abe70fec02456aba2219025f5202060eaece1. Task-number: QT-3583 Reviewed-by: Jason McDonald
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-201-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed some translations doc: Fixed typos in QAbstractFileEngineIterator Updated changelog for 4.7.
| * | | doc: Fixed typos in QAbstractFileEngineIteratorRobert Loehning2010-07-201-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Alessandro Portale
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-201-6/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added missing deployment to autotest. Fixed some deployment issues on Symbian. Fixed a QSplashScreen hanging bug in S60 3.1 devices.
| * | | Fixed a QSplashScreen hanging bug in S60 3.1 devices.axis2010-07-201-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSymbianBitmapDataAccess is used to provide access to the bitmap heap in a manner that locks correctly on all platform versions. The heapWasLocked variable was meant to protect against the case where the heap is locked recursively. However, it failed to take into account the case where the same QSymbianBitmapDataAccess object was used to lock recursively. In this case the variable would be changed to true on the second lock, which means that the lock would never be released again. This was fixed by making the access reference counted instead. Since the bitmap heap lock is global, the refcount was made global as well. Task: QTBUG-11129 RevBy: Jason Barron AutoTest: Works again. It was hanging before this fix.
* | | | Fix a Headerview layout bugPierre Rossi2010-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the sections were moved calling logicalIndex on what was already a logical index messed up the hidden sections. Task-number: QTBUG-12268 Reviewed-by: Gabriel
* | | | Qt does not build with qt_namespace on macosCarlos Manuel Duclos Vergara2010-07-201-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | The problem was that the QT_BEGIN_NAMESPACE was in the wrong place. I moved it 10 lines before and the problem is gone. Task-number: QTBUG-12262 Reviewed-by: Prasanth
* | | Extend the detection of CPU feature for x86Benjamin Poulain2010-07-192-1/+17
| | | | | | | | | | | | | | | | | | Add detection of CPU extension for SSE3, SSSE3, SSE4.1, SSE4.2 and AVX. Reviewed-by: Andreas Kling
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-07-198-6/+18
|\ \ \
| * | | Fix ListView sections with QList<QObject*>Martin Jones2010-07-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeVisualDataModel::stringValue() did not handle QList<QObject*> model types. Task-number: QTBUG-12005
| * | | Doc error fixes.Martin Jones2010-07-194-4/+4
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-198-22/+45
| |\ \ \
| * | | | PathView doc clarification.Martin Jones2010-07-192-1/+8
| | | | |
* | | | | Remove some more unneeded files from libjpeg, avoiding GPLaavit2010-07-192-775/+0
| |/ / / |/| | | | | | | | | | | | | | | Task-number: QT-3584 Reviewed-by: Trustme
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-191-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105 Always place PathView delegates centered on the path Add a PathView example.
| * | | Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105Martin Jones2010-07-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always place PathView delegates centered on the path The scale of the delegate was used to offset the item. This was a bad way of making the item appear to be positioned correctly when the default transform origin was the top-left. Now that transform origin is center, it is obvious that it was a bad idea. Task-number: QTBUG-12245 Reviewed-by: Michael Brasser
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-181-5/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Corrected BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2 Used aligned load and store when possible for the blending of ARGB32
| * | | | Corrected BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2Andreas Kling2010-07-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The unaligned prologue was processed without using the const alpha. Regressed with 9427b4c8f3b5.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-181-5/+28
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Used aligned load and store when possible for the blending of ARGB32
| | * | | Used aligned load and store when possible for the blending of ARGB32Benjamin Poulain2010-07-171-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unaligned load and store can be costly. This patch mitigate the problem by aligning the destination before using SSE2. The destination is aligned because it is used by load and store, while the source is only use by load. On Atom, the blending test is 7% faster for ARGB32. Re-pushing that patch, thanks to awesome policies... Reviewed-by: Andreas Kling
* | | | | Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-187-17/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is (supposedly) more efficient as the compiler can optimise it to a builtin, per Thiago. Merge-request: 2430 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
* | | | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-1798-552/+3755
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: tests/auto/qtexttable/tst_qtexttable.cpp
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-171-0/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rebuild configure.exe. QDeclarativeDebugTrace: Do not send message if the client did not enabled CanvasFrameRate
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-171-0/+12
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rebuild configure.exe. QDeclarativeDebugTrace: Do not send message if the client did not enabled CanvasFrameRate
| | | * | | QDeclarativeDebugTrace: Do not send message if the client did not enabled ↵Olivier Goffart2010-07-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CanvasFrameRate This silents a lot of warnings in creator. Reviewed-by: Aaron Kennedy
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-175-11/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Used aligned load and store when possible for the blending of ARGB32" Used aligned load and store when possible for the blending of ARGB32 Windows mobile: hide [X] button in task bar on unmaximize Windows mobile: the [X] button in the taskbar minimizes the widget Windows mobile: show the [X] button in the taskbar when maximizing unused struct DIBINFO removed from qguifunctions_wince.cpp Fixes the Oracle invalid date bug when date is greater or equal to 2800
| | * | | | | Revert "Used aligned load and store when possible for the blending of ARGB32"Jason McDonald2010-07-171-29/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3c11c0a8f2a99cb3734a24d9d6c43977807471d7, which breaks compilation on some platforms.
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-176-16/+52
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Used aligned load and store when possible for the blending of ARGB32 Windows mobile: hide [X] button in task bar on unmaximize Windows mobile: the [X] button in the taskbar minimizes the widget Windows mobile: show the [X] button in the taskbar when maximizing unused struct DIBINFO removed from qguifunctions_wince.cpp Fixes the Oracle invalid date bug when date is greater or equal to 2800
| | | * | | | | Used aligned load and store when possible for the blending of ARGB32Benjamin Poulain2010-07-161-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unaligned load and store can be costly. This patch mitigate the problem by aligning the destination before using SSE2. The destination is aligned because it is used by load and store, while the source is only use by load. On Atom, the blending test is 7% faster for ARGB32. Reviewed-by: Andreas Kling
| | | * | | | | Windows mobile: hide [X] button in task bar on unmaximizeJoerg Bornemann2010-07-163-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling showNormal on a window that was maximized, we must remove the [X] button from the task bar. But only if it was added by qt_wince_maximize. Task-number: QTBUG-8408 Reviewed-by: Martin Petersson
| | | * | | | | Windows mobile: the [X] button in the taskbar minimizes the widgetJoerg Bornemann2010-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The [X] or cancel button in the task bar shall just "minimize" the widget on Windows mobile. A press on this button results in a WM_COMMAND, IDCANCEL message. Before this patch we just sent a QCloseEvent to the widget, which had basically no effect. Now, we're calling showMinimzed(), which is the desired behaviour. Task-number: QTBUG-8408 Reviewed-by: Martin Petersson
| | | * | | | | Windows mobile: show the [X] button in the taskbar when maximizingJoerg Bornemann2010-07-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're now showing the cancel button explicitly in the taskbar on maximize, if the widget does not have the widget flags CancelButtonHint and OKButtonHint. Task-number: QTBUG-8408 Reviewed-by: Martin Petersson
| | | * | | | | unused struct DIBINFO removed from qguifunctions_wince.cppJoerg Bornemann2010-07-161-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Petersson
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-161-1/+1
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes the Oracle invalid date bug when date is greater or equal to 2800
| | | | * | | | | Fixes the Oracle invalid date bug when date is greater or equal to 2800Charles Yin2010-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By converting the char into unsigned char to avoid the overflow when getting the century from a char for years greater or equal to 2800. Task-number: QTBUG-8210 Reviewed-by: Michael Goddard
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1712-4/+2542
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Remove license headers from .pro files in new modelview examples. Doc: Added license documentation for 3rd party code and data. Do not crash if addrinfo signal does not contain ip address information. Link to the unsinstalled libraries first. Doc: Excluded the QML documentation from the Qt-only set. Doc: Whitespace fixes. Doc: Fixed whitespace issues. Revert the change in applicationShouldTerminate(). Added LatinAmericaAndTheCaribbean country to the doc. Network Proxy Query: Fix memleak on OS X Doc: Reviewed Michael's model/view tutorial and overview document. Doc: Removed accidentally committed file. Doc: Fixed incorrect QML property type. new image for tutorial.qdoc replaced image, license headers, more links in modelview.qdoc file Doc: Added the standard three clause BSD license header. I've cleaned up the qdoc file a bit. correction of snippet tags integrating modelview tutorial in the build system, first attempt new version of modelview.qdoc with snippets ...
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1612-4/+2542
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Doc: Added license documentation for 3rd party code and data. Do not crash if addrinfo signal does not contain ip address information. Link to the unsinstalled libraries first. Doc: Excluded the QML documentation from the Qt-only set. Doc: Whitespace fixes. Doc: Fixed whitespace issues. Revert the change in applicationShouldTerminate(). Added LatinAmericaAndTheCaribbean country to the doc. Network Proxy Query: Fix memleak on OS X Doc: Reviewed Michael's model/view tutorial and overview document. Doc: Removed accidentally committed file. Doc: Fixed incorrect QML property type. new image for tutorial.qdoc replaced image, license headers, more links in modelview.qdoc file Doc: Added the standard three clause BSD license header. I've cleaned up the qdoc file a bit. correction of snippet tags integrating modelview tutorial in the build system, first attempt new version of modelview.qdoc with snippets Rolands ModelView Source ...
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-16214-6279/+11219
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt.qdocconf
| | | | * | | | | | Do not crash if addrinfo signal does not contain ip address information.Jukka Rissanen2010-07-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: NB#176643 - Segmentation fault occurs while using networking Reviewed-by: Adrian Constantin
| | | | * | | | | | Revert the change in applicationShouldTerminate().Fabien Freling2010-07-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to fix an issue during logout but it seems to be fine now. Related issue: QTBUG-6296 Task-number: QTBUG-10993 Reviewed-by: Morten Sorvig
| | | | * | | | | | Added LatinAmericaAndTheCaribbean country to the doc.Denis Dzyubenko2010-07-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12063 Reviewed-by: trustme
| | | | * | | | | | Network Proxy Query: Fix memleak on OS XMarkus Goetz2010-07-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12106
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-1619-52/+169
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-1422-392/+542
| | | | |\ \ \ \ \ \
generated by cgit v0.12 at 2024-12-27 15:28:43 (GMT)