summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-19874-26298/+41652
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-1913-76/+80
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Disable translatedRotatedAndScaledPainter testcase as it is broken. Fixed partial update on QLineEdit disable the outlinefillconsistency test until the line algorithm has been updated. Fix nasty copy-paste bug in fetchTransformedBilinear() fix breakages in qpainter autotests. QMetaType: add "signed char" as builtin. Fix how subpixel positions are intepreted in an aliased grid.
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-08-193-8/+19
| | |\
| | | * Fixed partial update on QLineEditThierry Bastian2010-08-183-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLineControl passes a QRect to tell when a partial update is needed. We used to connect this slot to update. This made the whole lineedit update when the cursor blinked. Task-number: QTBUG-12709 Reviewed-by: gabi
| | * | Disable translatedRotatedAndScaledPainter testcase as it is broken.Gunnar Sletta2010-08-191-1/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the order of rounding to fixedpoint is different in the static and normal text case and this leads to some glyphs occationally being 1 pixel off. In the normal case, the glyphs are laid out and positioned in fixed point, then transformed using the full current matrix including the position which is then snapped to integer device space when drawn. In the static text case, the glyphs are laid out and positioned in fixed point related to 0,0. The actual device position is then added to the glyph positions.
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-08-186-29/+180
| | |\
| | | * Fix nasty copy-paste bug in fetchTransformedBilinear()Paul Olav Tvete2010-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Introduced in commit 0d7e68391 Reviewed-by: Samuel
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-178-65/+36
| | | |\ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix breakages in qpainter autotests. QMetaType: add "signed char" as builtin. Fix how subpixel positions are intepreted in an aliased grid.
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-175-27/+178
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Designer: Add 'Simplify rich text' filter to rich text editor.
| | * | | Designer: Add 'Simplify rich text' filter to rich text editor.Friedemann Kleint2010-08-175-27/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to filter out style elements created by the text engine to keep the rich text simple. Acked-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-10890
| | | * | disable the outlinefillconsistency test until the line algorithm has been ↵Gunnar Sletta2010-08-181-0/+3
| | | |/ | | | | | | | | | | | | | | | | | | | | updated. There is a P1 task for 4.8 to fix it.
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-08-17817-21266/+47713
| | | |\
| | | | * QMetaType: add "signed char" as builtin.Olivier Goffart2010-08-163-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the c++ specificaiton, 3.9.1 [basic.fundamentals] Plain char, signed char, and unsigned char are three distinct types In QMetaType, I decide that 'signed char' alias with 'char' This allow qint8 to work nice (and which is already registered as an alias to char (QMetaType::Char) Reviewed-by: Joao Task-number: QTBUG-12920
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-164-62/+31
| | | | |\ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix how subpixel positions are intepreted in an aliased grid.
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1637-213/+1111
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cannot enter text through character viewer on Mac (Cocoa) QNAM HTTP: Remove eatWhitespace() hack QNAM: Fix namespaced compilation Revert the addition of the test of QtTest's random feature. QAbstractSocket: Remove warning QNAM Zerocopy: Benchmark tst_qbytearray: Auto test for reserve() tst_qiodevice: Add peek()ing auto test tst_qnetworkreply: Zerocopy auto test tst_qhttpnetworkconnection: Pipelining auto test QNAM Zerocopy: QNAM implementation part QNAM Zerocopy: HTTP implementation part QAbstractSocket: Enable Unbuffered OpenMode for TCP QNativeSocketEngine: Fix wrong debug output Added QObject::senderSignalIndex() Cleanup the connection list logic in QObject::sender Fixed linking against libQtTest on Mac. Added -random option to tests, making the test cases within a test execute in arbitrary order. Very useful for avoiding test cases being dependent on the running order.
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1337-213/+1111
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cannot enter text through character viewer on Mac (Cocoa) QNAM HTTP: Remove eatWhitespace() hack QNAM: Fix namespaced compilation Revert the addition of the test of QtTest's random feature. QAbstractSocket: Remove warning QNAM Zerocopy: Benchmark tst_qbytearray: Auto test for reserve() tst_qiodevice: Add peek()ing auto test tst_qnetworkreply: Zerocopy auto test tst_qhttpnetworkconnection: Pipelining auto test QNAM Zerocopy: QNAM implementation part QNAM Zerocopy: HTTP implementation part QAbstractSocket: Enable Unbuffered OpenMode for TCP QNativeSocketEngine: Fix wrong debug output Added QObject::senderSignalIndex() Cleanup the connection list logic in QObject::sender Fixed linking against libQtTest on Mac. Added -random option to tests, making the test cases within a test execute in arbitrary order. Very useful for avoiding test cases being dependent on the running order.
| | * | | Cannot enter text through character viewer on Mac (Cocoa)Prasanth Ullattil2010-08-132-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This text is delivered through the NSTextInput protocol. Since it was not initiated from a keyDown message, we were ignoring the insertText: message. Reviewed-by: Denis
| | * | | QNAM HTTP: Remove eatWhitespace() hackMarkus Goetz2010-08-132-30/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the Unbuffered TCP rewrite this brought more trouble than it helped. Better fix the chunked decoder soon. Reviewed-by: Peter Hartmann
| | * | | QNAM: Fix namespaced compilationMarkus Goetz2010-08-121-1/+3
| | | | |
| | * | | Revert the addition of the test of QtTest's random feature.Thiago Macieira2010-08-129-114/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was added in commit 56396b4b2b66da3133aff1b3864c550ce892d233. Even though we have a -seed argument to provide reproduceability, it's only reproduceable if the PRNG algorithm is also kept. So we can't autotest this when we don't control the algorithm (for example, it's different from glibc to MSVC's runtime).
| | * | | QAbstractSocket: Remove warningMarkus Goetz2010-08-121-1/+0
| | | | |
| | * | | QNAM Zerocopy: BenchmarkMarkus Goetz2010-08-121-1/+71
| | | | |
| | * | | tst_qbytearray: Auto test for reserve()Markus Goetz2010-08-121-0/+18
| | | | | | | | | | | | | | | | | | | | This auto test tests undocumented but expected/intuitive behaviour.
| | * | | tst_qiodevice: Add peek()ing auto testMarkus Goetz2010-08-121-0/+59
| | | | |
| | * | | tst_qnetworkreply: Zerocopy auto testMarkus Goetz2010-08-121-1/+95
| | | | |
| | * | | tst_qhttpnetworkconnection: Pipelining auto testMarkus Goetz2010-08-121-0/+48
| | | | |
| | * | | QNAM Zerocopy: QNAM implementation partMarkus Goetz2010-08-126-1/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Jeremy Katz Reviewed-by: Aleksandar Sasha Babic
| | * | | QNAM Zerocopy: HTTP implementation partMarkus Goetz2010-08-127-67/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Jeremy Katz Reviewed-by: Aleksandar Sasha Babic
| | * | | QAbstractSocket: Enable Unbuffered OpenMode for TCPMarkus Goetz2010-08-121-32/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: Jeremy Katz Reviewed-by: Aleksandar Sasha Babic
| | * | | QNativeSocketEngine: Fix wrong debug outputMarkus Goetz2010-08-121-1/+1
| | | | |
| | * | | Added QObject::senderSignalIndex()John Brooks2010-08-123-3/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns the metamethod index of the signal executing the current slot Merge-request: 2433 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| | * | | Cleanup the connection list logic in QObject::senderJohn Brooks2010-08-121-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2433 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1221-72/+367
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed linking against libQtTest on Mac. Added -random option to tests, making the test cases within a test execute in arbitrary order. Very useful for avoiding test cases being dependent on the running order.
| | | * | | Fixed linking against libQtTest on Mac.Rohan McGovern2010-08-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: `ld: framework not found QtTest' testlib was forcing CONFIG+=debug, which caused only the QtTest_debug variant of the framework to be produced on Mac. Qt libraries shouldn't force release or debug at this level.
| | | * | | Added -random option to tests, making the test cases within a test execute ↵Magne Pettersen Zachrisen2010-08-1122-72/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in arbitrary order. Very useful for avoiding test cases being dependent on the running order. Added -seed option -random to make it possible to reroduce test results. The seed is printed out when -random is specified Added selftests for -random and -seed options Changed int parsing into strtol and QTime->QDateTime as suggested by Mr Macieira, fixed selftests Merge-request: 2362 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-08-13782-21053/+46595
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (354 commits) Clean up rasterfallback mechanism in DirectFB QNAM HTTP: Fix crash related to aborted uploads Destroy the old runtime system only when existing pixmaps were migrated. Fixed autotest failure in tst_qgl::clipTest. Properly emit geometryChanged() when the position change. Make bld.inf target in Symbian mkspecs to depend on .pro file Fixed build failure Added way to destroy the share widget in the GL graphics system. QCoreApplication::library path, ensure mutex lock ordering Fix memory leak. QAudioOutput(ALSA); Fix check for available devices. qdoc: All references to -assistant and -base were removed. Only modify pixmap cache reply when protected by a mutex Fix broken example code Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds ...
| | * \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-13782-21053/+46595
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-134-104/+100
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Clean up rasterfallback mechanism in DirectFB QNAM HTTP: Fix crash related to aborted uploads
| | | | * | | | Clean up rasterfallback mechanism in DirectFBDonald Carr2010-08-122-103/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Being able to debug which paint operations are slow with Qt/DirectFB is currently only possible in debug builds (which defeats the purpose somewhat) or by frequent recompilation (with different defines). This patch cleans up the mechanism somewhat and makes it available in release builds as well. The overhead is a single int comparison so it really isn't a performance issue to have this code in place at all times. Reviewed-by: Anders Bakken <agbakken@gmail.com>
| | | | * | | | QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12285
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-122-8/+15
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make bld.inf target in Symbian mkspecs to depend on .pro file
| | | | * | | | | Make bld.inf target in Symbian mkspecs to depend on .pro fileMiikka Heikkinen2010-08-122-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to .pro file weren't previously noticed and therefore qmake wasn't rerun. Qmake command itself was also incorrect. Task-number: QTBUG-12716 Reviewed-by: Shane Kearns
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-122-15/+18
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioOutput(ALSA); Fix check for available devices. Phonon; Update CMakeLists.txt
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-122-15/+18
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioOutput(ALSA); Fix check for available devices. Phonon; Update CMakeLists.txt
| | | | | * | | | | | QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-121-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALSA can return a list of one empty item when no devices are available. Task-number: QTBUG-12690 Reviewed-by: Andrew den Exter
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Justin McPherson2010-08-12330-8853/+20799
| | | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-08-06172-1975/+4228
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7
| | | | | * | | | | | | | Phonon; Update CMakeLists.txtJustin McPherson2010-08-041-1/+1
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-124-5/+31
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Properly emit geometryChanged() when the position change. QCoreApplication::library path, ensure mutex lock ordering Fix memory leak.
| | | | * | | | | | | | | Properly emit geometryChanged() when the position change.Alexis Menard2010-08-122-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also emit the signal at the very end, so people can rely on the resize event to adjust some stuff in their item. Reviewed-by:yoann