summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-182-20/+20
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use GLIBC functions on any GLIBC architecture. tst_qnetworkreply: Fix ugly test
| * Use GLIBC functions on any GLIBC architecture.Oswald Buddenhagen2010-11-171-3/+3
| | | | | | | | | | | | | | | | | | | | Make use of __GLIBC__ instead of Q_OS_LINUX for functions available globally in GNU libc, not just on Linux. the !__UCLIBC__ are still needed, as uClibc defines __GLIBC__ for compatibility with a lot of applications which rely on it. Task-number: QTBUG-15401
| * tst_qnetworkreply: Fix ugly testMarkus Goetz2010-11-171-17/+17
| | | | | | | | | | | | | | | | | | Properly use the event loop. Signals have to be connected directly after using the get() method of QNetworkAccessManager. Else they might have already been emitted while the event loop was spinning. Reviewed-by: Peter Hartmann
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-174-19/+18
|\ \ | |/ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix license text. Doc: fix a typo in QML/Qt UI integration
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-174-19/+18
| |\ |/ / | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix license text. Doc: fix a typo in QML/Qt UI integration
| * Fix license text.Jason McDonald2010-11-173-18/+17
| | | | | | | | Reviewed-by: Trust Me
| * Doc: fix a typo in QML/Qt UI integrationPierre Rossi2010-11-161-1/+1
| | | | | | | | Reviewed-by: Geir Vattekar
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-17386-12050/+9037
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove pointSize from visual tests Update visuals for X11 Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077 Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747 Remove some excess pngs Update qml visual tests VisualDataModel::count should be 0 until a valid delegate is set. Doc: Remove default from PathView path property Record images on more than just the first frame. Turn off font antialiasing during tests. Shrink size of a visual test
| * Remove pointSize from visual testsAlan Alpert2010-11-173-2/+2
| | | | | | | | | | | | Too unstable Task-number: QTBUG-14792
| * Update visuals for X11Alan Alpert2010-11-1741-1404/+1404
| | | | | | | | | | | | | | | | Text visual tests may be dependant on the specific version of libfreetype. Comparison images have been regenerated with the specific version that the test machines use. Task-number: QTBUG-14792
| * Added missing symbols in QtCore and QtGui def files needed by fix made to ↵Joona Petrell2010-11-162-1/+4
| | | | | | | | QT-4077
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-162-0/+3
| |\
| | * Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747Martin Jones2010-11-162-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PathView needed to update internal item count when delegate was set. VDM::count() didn't call into the internal VDM when querying count. Task-number: QTBUG-14781 Reviewed-by: Alan Alpert
| * | Remove some excess pngsAlan Alpert2010-11-1615-0/+0
| |/ | | | | | | | | | | These are no longer used by these tests Task-number: QTBUG-14792
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-1635-145/+206
| |\
| | * VisualDataModel::count should be 0 until a valid delegate is set.Martin Jones2010-11-162-0/+26
| | | | | | | | | | | | | | | | | | | | | There are no visual items if there is no delegate. Task-number: QTBUG-14781 Reviewed-by: Robert Griebl
| | * Doc: Remove default from PathView path propertyMartin Jones2010-11-161-1/+0
| |/ |/| | | | | Task-number: QTBUG-15073
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: doc: Fix documentation of QTextEdit::setDocument
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-151-1/+1
| |\ \ |/ / / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: doc: Fix documentation of QTextEdit::setDocument
| * | doc: Fix documentation of QTextEdit::setDocumentEskil Abrahamsen Blomfeldt2010-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextEdit::setDocument() has failed to delete its current document since June 2006 despite its claims of the otherwise. Since most Qt versions now exhibit this behavior, the only safe way to fix the problem is to change the documentation to reflect what actually happens. Task-number: QTBUG-14049 Reviewed-by: Lars
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-153-3/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed QGesture autotest for QGesture lazy deletion. Crash fix, when the Object will be deleted during handling a QGestureEvent.
| * | | Fixed QGesture autotest for QGesture lazy deletion.Dominik Holland2010-11-151-1/+3
| | | | | | | | | | | | | | | | Reviewed By: Trust Me
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-152-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Crash fix, when the Object will be deleted during handling a QGestureEvent.
| | * | | Crash fix, when the Object will be deleted during handling a QGestureEvent.Dominik Holland2010-11-122-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGestures will now not be deleted immediatly. QGestureManager waits until all QGestureEvents are processed and will delete the QGestures afterwards. Task: QT-4022 Reviewed By: Zeno Albisser
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-1528-140/+167
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) compile with quintptr instead of intptr_t Enable OpenGL scissors test Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, add -Wno-psabi Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWait QNAM HTTP: Ignore double content-length headers Don't pack Harfbuzz structs, this causes unaligned access crashes. qmake vcxproj generator: fix description of custom build tools Fix for KERN-EXEC 0 caused by QNetworkAccessManager::get Minor adjustments to merge-request 915 Implement brush transformations for directfb. Add FreeBSD's certificate bundle to the certificates list. SSL internals: upon error, read all errors from OpenSSL Added an example for QTest::touchEvent to the documentation. Push and pop the thread-default context for the current thread Fix compilation by s/intptr_t/quintptr/ qmake vcxproj generator: fix description of custom build tools Minor adjustments to merge-request 915 Implement brush transformations for directfb. Add FreeBSD's certificate bundle to the certificates list. SSL internals: upon error, read all errors from OpenSSL ...
| * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Perttu Pohjonen2010-11-153-9/+6
| |\ \ \ \ \
| | * | | | | compile with quintptr instead of intptr_tThiago Macieira2010-11-151-1/+1
| | | | | | |
| | * | | | | Enable OpenGL scissors testAdrian Constantin2010-11-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Petri Latvala
| | * | | | | Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, ↵Petri Latvala2010-11-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add -Wno-psabi Reviewed-by: Adrian Constantin
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7stagingVille Pernu2010-11-1530-191/+452
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7stagingVille Pernu2010-11-120-0/+0
| | |\ \ \ \ \ \
| | * | | | | | | qmake vcxproj generator: fix description of custom build toolsJoerg Bornemann2010-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description of custom build tools that handle more than one extra compiler cannot be separated by ampersands in Visual Studio 2010. This seems to be a msbuild bug. We'll just circumvent this issue by changing the separator in the description to comma. Task-number: QTBUG-13986 Reviewed-by: ossi
| | * | | | | | | Fix for KERN-EXEC 0 caused by QNetworkAccessManager::getVille Pernu2010-11-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT-4155 bug. Canceling Network Session before canceling connection notifier notifications causes a call to an invalid RConnection instance. Fix: CanceL Network session after canceling notifications.
| | * | | | | | | Minor adjustments to merge-request 915Donald Carr2010-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix minor stylistic issue raised by Oswald Removed duplicate sourceSurface pointer introduced by sibling merge request
| | * | | | | | | Implement brush transformations for directfb.Sam Magnuson2010-11-121-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 915 Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit b62079cf17044e09999eb1808788926ea921fb05)
| | * | | | | | | Add FreeBSD's certificate bundle to the certificates list.Raphael Kubo da Costa2010-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FreeBSD base system does not ship a certificate bundle, but the ca_root_nss port provides one extracted from Mozilla's root CA list. As discussed in QTBUG-14013, it should be preferrable to have bundle files than separate certificate files, so the path for the certificate has been added directly. Signed-off-by: Raphael Kubo da Costa <kubito@gmail.com> Merge-request: 896 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | | | | | SSL internals: upon error, read all errors from OpenSSLPeter Hartmann2010-11-122-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and not only the last one. One call to OpenSSL can produce several errors, which we should always read all. Otherwise, malicious clients could intentionally poison the error queue. Inspired-by: Merge request 2290 Reviewed-by: Olivier Goffart Reviewed-by: Markus Goetz Task-number: QTBUG-14513
| | * | | | | | | Added an example for QTest::touchEvent to the documentation.Denis Dzyubenko2010-11-122-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | | | Push and pop the thread-default context for the current threadPhilip Van Hoof2010-11-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 869 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> (cherry picked from commit aa88b7044dd86850e6986aa80104bb38bb7b12eb)
| | * | | | | | | Fix compilation by s/intptr_t/quintptr/Thiago Macieira2010-11-123-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intptr_t is defined in some C header that we don't include. I don't know which one it is, but without it, it fails to compile with: declarative/qml/qdeclarativecontext.cpp:477: error: 'intptr_t' was not declared in this scope Reviewed-By: Trust Me
| * | | | | | | | Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWaitPerttu Pohjonen2010-11-152-14/+33
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the initial problem of this error opened up a possibility to start a new WLAN scan while there was one still ongoing. This caused a crash. Task-number: QT-3996
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-1523-117/+128
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Ignore double content-length headers Don't pack Harfbuzz structs, this causes unaligned access crashes. qmake vcxproj generator: fix description of custom build tools Minor adjustments to merge-request 915 Implement brush transformations for directfb. Add FreeBSD's certificate bundle to the certificates list. SSL internals: upon error, read all errors from OpenSSL Added an example for QTest::touchEvent to the documentation. Push and pop the thread-default context for the current thread Fix compilation by s/intptr_t/quintptr/
| | * | | | | | QNAM HTTP: Ignore double content-length headersMarkus Goetz2010-11-133-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15311 Reviewed-by: ogoffart
| | * | | | | | Don't pack Harfbuzz structs, this causes unaligned access crashes.Andreas Kling2010-11-1210-78/+0
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The memory-greediest structs have been reordered anyway, so the gain from forcibly packing them is mostly negligible. Task-number: QTBUG-13395 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | | | qmake vcxproj generator: fix description of custom build toolsJoerg Bornemann2010-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description of custom build tools that handle more than one extra compiler cannot be separated by ampersands in Visual Studio 2010. This seems to be a msbuild bug. We'll just circumvent this issue by changing the separator in the description to comma. Task-number: QTBUG-13986 Reviewed-by: ossi
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-119-35/+86
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Minor adjustments to merge-request 915 Implement brush transformations for directfb. Add FreeBSD's certificate bundle to the certificates list. SSL internals: upon error, read all errors from OpenSSL Added an example for QTest::touchEvent to the documentation. Push and pop the thread-default context for the current thread Fix compilation by s/intptr_t/quintptr/
| | | * | | | Minor adjustments to merge-request 915Donald Carr2010-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix minor stylistic issue raised by Oswald Removed duplicate sourceSurface pointer introduced by sibling merge request
| | | * | | | Implement brush transformations for directfb.Sam Magnuson2010-11-111-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 915 Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit b62079cf17044e09999eb1808788926ea921fb05)
| | | * | | | Add FreeBSD's certificate bundle to the certificates list.Raphael Kubo da Costa2010-11-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FreeBSD base system does not ship a certificate bundle, but the ca_root_nss port provides one extracted from Mozilla's root CA list. As discussed in QTBUG-14013, it should be preferrable to have bundle files than separate certificate files, so the path for the certificate has been added directly. Signed-off-by: Raphael Kubo da Costa <kubito@gmail.com> Merge-request: 896 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | | * | | | SSL internals: upon error, read all errors from OpenSSLPeter Hartmann2010-11-112-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and not only the last one. One call to OpenSSL can produce several errors, which we should always read all. Otherwise, malicious clients could intentionally poison the error queue. Inspired-by: Merge request 2290 Reviewed-by: Olivier Goffart Reviewed-by: Markus Goetz Task-number: QTBUG-14513
generated by cgit v0.12 at 2025-01-26 15:40:03 (GMT)