summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make lupdate recognize TRANSLATOR comments in QtScript filesKent Hansen2010-11-225-12/+205
| | | | | | | | | | | | - Made the output translator a member of the parser, since the processComment() callback needs it now. - Made the context for tr()/TR_NOOP() a member of the parser, since it should persist for subsequent tr calls. - The comment processing logic should match that of cpp.cpp, as usual. Task-number: QTBUG-15502 Reviewed-by: Oswald Buddenhagen
* no_debug_info.prf: Also handle MSVC.hjk2010-11-221-4/+13
| | | | Reviewed-by: Marius Storm-Olsen
* Revert "Don't destroy Qt's internal pthread_key_t if it was not initialized"Bradley T. Hughes2010-11-221-8/+8
| | | | | | | | This reverts commit 8c31c6529935cd9ee6f99bc38cfd182d5b3182e2 due to a regression in the QThreadStorage autotest. Fix the problem another way: call pthread_once() in the destructor function to ensure that we always call pthread_key_delete() on a key we created.
* Revert "Resolve two save/restore geometry issues on X11."Morten Johan Sørvig2010-11-222-7/+7
| | | | This reverts commit 3b80b70d1464320aee2b38ddeb1ec0d257f6bd1c.
* Fix QScriptValue::construct.Jedrzej Nowacki2010-11-223-1/+27
| | | | | | | It is not allowed to mix values that were created in different QScriptEngine instances. Reviewed-by: Kent Hansen
* Split tst_QScriptValue::construct tests into smaller chunks.Jedrzej Nowacki2010-11-222-107/+147
| | | | Reviewed-by: Kent Hansen
* Docs: QTBUG-10866 Description of how an AutoConnection is resolved.Peter Yard2010-11-221-5/+4
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-209-135/+219
|\ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add script translation test data for plural forms Refactor script translation tests Resolve two save/restore geometry issues on X11. Split newQObject tests into smaller chunks. Compile fix Don't destroy Qt's internal pthread_key_t if it was not initialized
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-199-135/+219
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add script translation test data for plural forms Refactor script translation tests Resolve two save/restore geometry issues on X11. Split newQObject tests into smaller chunks. Compile fix Don't destroy Qt's internal pthread_key_t if it was not initialized
| | * Add script translation test data for plural formsKent Hansen2010-11-194-0/+30
| | |
| | * Refactor script translation testsKent Hansen2010-11-191-66/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a TranslationScope helper class to reduce the amount of copy&paste for installing translations. - Make translateScript() function data-driven. - Move special cases of script translation into separate test functions. Reviewed-by: Jedrzej Nowacki
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-195-70/+51
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Resolve two save/restore geometry issues on X11. Split newQObject tests into smaller chunks. Compile fix Don't destroy Qt's internal pthread_key_t if it was not initialized
| | | * Resolve two save/restore geometry issues on X11.Morten Johan Sørvig2010-11-182-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Brad 1: When restoring non-fullscreen geometry we would offset the position if the window was currently fullscreen. This seems wrong; the window geometry is set correctly without the offset. 2: QWidget::geometry() returns erroneous values after restoring old full-screen geometry . The window itself is positioned correctly on screen. This is a very minor use case, let it silently fail.
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-183-63/+44
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Split newQObject tests into smaller chunks. Compile fix Don't destroy Qt's internal pthread_key_t if it was not initialized
| | | | * Split newQObject tests into smaller chunks.Jedrzej Nowacki2010-11-182-56/+36
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen
| | | | * Compile fixBradley T. Hughes2010-11-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the Q_UNUSED(), which uses template magic for some compilers, but some compilers don't accept local types as the template argument. Reviewed-by: trustme
| | | | * Don't destroy Qt's internal pthread_key_t if it was not initializedBradley T. Hughes2010-11-181-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The destructor function destroy_current_thread_data_key() was always called on library unload, even if the pthread_key_t was not initialized. This can cause us to destroy a key that doesn't belong to us, as pointed out in the task below. Fix this by creating a function static instance of a class whose destructor will destroy the key. Task-number: QTBUG-10861 Reviewed-by: Morten Sørvig
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-191-3/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QTBUG-4201 fixed
| * | | | QTBUG-4201 fixedakorenevsky2010-11-191-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 660 Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
* | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-19487-13560/+10807
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (58 commits) Fine-tune the tests being run on the CI system. Standardize selection color in visual test Use GLIBC functions on any GLIBC architecture. tst_qnetworkreply: Fix ugly test Fix license text. Remove pointSize from visual tests Update visuals for X11 Doc: fix a typo in QML/Qt UI integration 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 doc: Fix documentation of QTextEdit::setDocument Fixed QGesture autotest for QGesture lazy deletion. compile with quintptr instead of intptr_t ...
| * \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-19487-13560/+10807
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-1815-564/+540
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fine-tune the tests being run on the CI system. Standardize selection color in visual test
| | | * | | | Fine-tune the tests being run on the CI system.Alan Alpert2010-11-181-36/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to bother running tests on QWS, or text tests on X11 until they update the ubuntu version. Task-number: QTBUG-14792
| | | * | | | Standardize selection color in visual testAlan Alpert2010-11-1814-528/+530
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14792
| | * | | | | 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
| | | |\ \ \ \ \ \ \ \