summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes deployment rules for embedded qml demos application.Aaron McCarthy2010-07-197-0/+7
| | | | | | The deployment rules for the qml resources in the embedded qml demo applications were not being generated correctly as data_caging_paths was not being loaded.
* Fix build on Symbian.Aaron McCarthy2010-07-191-3/+0
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1810-20/+20
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove qMemCopy() usage from all .cpp files of Qt itself.
| * Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-1810-20/+20
|/ | | | | | | | 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 branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-07-1731-145/+423
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (50 commits) Fix compilation after merge Fixed some network tests never being run. Remove test cases which cause stack overflow Avoid a crash in the OpenVG paint engine when clipping to an empty path Fix last character being overwritten in password field Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 038b62085831eef4dee423361c65ecd55b7b9b1d ) QSslSocket: Improve error handling Compile when bootstrapping qmake Fix regression in tst_qrand::testqrand() syncqt: don't try to split %module's values syncqt: fix wrong paths in include/ActiveQt/headers.pri Fix a crash when recursing into QSharedPointer from QSharedPointer::clear() Fix a couple of memory leaks due to not releasing CFTypes on Mac Initalize the nativeDialogInUse variable The Q_WGL define was removed years ago. Compile QUUid::createUuid() should not generate identical sequences on UNIX typos fixed Use lower case for including system header files Added trace statements to Phonon MMF backend ...
| * Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-171-1/+1
| |\ | | | | | | | | | | | | Conflicts: tests/auto/network.pro
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-161-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed some network tests never being run.
| | | * Fixed some network tests never being run.Rohan McGovern2010-07-161-1/+1
| | |/ | | | | | | | | | | | | | | | This logic for private_tests was the opposite of what it should be, meaning that network tests which use Q_AUTOTEST_EXPORTs have not been run for some time :-(
| * | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-17323-3084/+10957
| |\ \ | |/ / |/| | | | | | | | 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-172-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-172-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
| | * | | Rebuild configure.exe.Jason McDonald2010-07-171-0/+0
| | | | |
| | * | | 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-1790-97/+5938
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | | | Remove license headers from .pro files in new modelview examples.Jason McDonald2010-07-177-280/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit attempts to fix the latest staging failure. According to Nokia Legal, .pro files are not copyrightable and thus need not carry license headers. In any case, C-style comments aren't valid for .pro files and broke the build.
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1690-97/+6218
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | * | | | | | Doc: Added license documentation for 3rd party code and data.David Boddie2010-07-162-16/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3585 Pre-approved-by: Legal Reviewed-by: Trust Me
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-16467-8867/+19403
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | Link to the unsinstalled libraries first.Petri Latvala2010-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3371 Reviewed-by: Harald Fernengel
| | | * | | | | | 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-16101-855/+1920
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-1453-464/+1179
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of ../oslo-staging-1 into 4.7Lorn Potter2010-07-14801-16821/+22705
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-30111-325/+653
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | make sure ap's are removed when the device is removedLorn Potter2010-06-303-28/+74
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-2841-268/+461
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-271791-47018/+36491
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | fix actions regarding removal of connman. make tests pass on desktopLorn Potter2010-06-272-81/+91
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-21123-548/+2342
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | fix ghost ap issue, and dont block on connectLorn Potter2010-06-212-82/+235
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-17626-7031/+13947
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | initial connman bearer backend.Lorn Potter2010-06-077-1/+2324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still needs work, debugging, additional threading support, and probably refactoring. This includes a connman dbus service wrapper that has more functionality than is needed by the bearer backend but still missing some 'set' functionality for a complete connman wrapper. Developed with wifi/desktop on 'lucid' kubuntu, using the connman available at http://ppa.launchpad.net/indicator-network-developers/ppa/ubuntu
| | * | | | | | | | | | | | | | Doc: Excluded the QML documentation from the Qt-only set.David Boddie2010-07-163-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | | | | | | | | | Doc: Whitespace fixes.David Boddie2010-07-162-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | | | | | | | | | Doc: Fixed whitespace issues.David Boddie2010-07-162-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | | | | | | | | | Doc: Reviewed Michael's model/view tutorial and overview document.David Boddie2010-07-1319-376/+564
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | | | | | | | | | Doc: Removed accidentally committed file.David Boddie2010-07-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-11-05 14:20:00 (GMT)