summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-114-9/+40
|\ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: ShortcutOverride has no effect on some shortcuts on Mac OS X (Cocoa). Fix restore of maximized window geometry on Windows Remove qDebug.
| * ShortcutOverride has no effect on some shortcuts on Mac OS X (Cocoa).Prasanth Ullattil2010-11-112-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating the native key sequences for menu items, Qt prefers the non private unicode characters. But the characters in the NSEvent for keyboard events can contain characters form the unicode range reserved for Apple. For e.g. when user presses the "delete" key, the event contains NSDeleteFunctionKey, where in Qt is expecting NSDeleteCharacter. For now this is the only key identified for translation. If we find similar translations, those can be added to qt_mac_removePrivateUnicode(). Task-number: QTBUG-12495 Reviewed-by: Denis
| * Fix restore of maximized window geometry on WindowsMorten Johan Sørvig2010-11-111-0/+4
| | | | | | | | Task-number: QTBUG-2064
| * Remove qDebug.Morten Johan Sørvig2010-11-111-1/+0
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-113-5/+20
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix for font engines that don't support subpixel positioning
| * | Fix for font engines that don't support subpixel positioningJiang Jiang2010-11-113-5/+20
| | | | | | | | | | | | Reviewed-by: aavit
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-112-2/+62
|\ \ \ | |/ / |/| / | |/ | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Support exception handling in QtConcurrent::run()
| * Support exception handling in QtConcurrent::run()Morten Johan Sørvig2010-11-112-2/+62
|/ | | | Use QFutureInterface::reportException() in the same way that we do in QtConcurrent::map().
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-10101-34/+123
|\ | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023 Fix warnings QtCore autotests: make them paralelized. Fix crash in tst_QByteArray::qUncompress Support glyph subpixel positioning without subpixel rendering
| * Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023Olivier Goffart2010-11-101-2/+2
| | | | | | | | It is a typo. Else, it overflows
| * Fix warningsOlivier Goffart2010-11-101-4/+4
| | | | | | | | | | | | Regarding conversion from char* to QString Reviewed-by: Joao
| * QtCore autotests: make them paralelized.Olivier Goffart2010-11-1094-0/+99
| | | | | | | | | | | | | | | | | | | | | | The filesystem autotests are not paralized (because i was scary) For reference, script I used: cat corelib.pro | grep -v "=" | grep \\\\ | cut -f1 -d\\ | sed "s/\(.*\) /\1/" | grep -v file | xargs -I{} echo "echo CONFIG += parallel_test >> {}/{}.pro" > t . t Reviexed-by: Joao
| * Fix crash in tst_QByteArray::qUncompressOlivier Goffart2010-11-101-0/+10
| | | | | | | | | | | | | | On 64-bit systems, len + sizeof(QByteArray::Data) could overflow and become 0 In this case, qRealloc could succeed and return 0, leading to a double free. Reviewed-by: Joao
| * Support glyph subpixel positioning without subpixel renderingJiang Jiang2010-11-105-30/+10
| | | | | | | | | | | | | | | | | | | | | | | | Previously subpixel positioning was only used when subpixel rendering is enabled (glyphType == Raster_RGBMask), however, it does not necessarily require that and for Mac OS X it will keep using subpixel positioning even when LCD font smoothing (subpixel rendering) is turned off. To maintain consistency when switching to raster, we should support subpixel positioning in this case. Task-number: QTBUG-5053 Reviewed-by: Jørgen Lind
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-102-0/+4
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update the text cursor's position for input method events.
| * | Update the text cursor's position for input method events.Pierre Rossi2010-11-102-0/+4
| | | | | | | | | | | | | | | Task-number: QTBUG-2064 Reviewed-by: Jiang Jiang
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-11-101-0/+73
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Add autotest for [re]setBindingForObject
| * | QDeclarativeDebug: Add autotest for [re]setBindingForObjectKai Koehne2010-11-101-0/+73
|/ / | | | | | | | | Add initial testing for setBindingForObject, resetBindingForObject in QDeclarativeDebug.
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-107-974/+1652
|\ \ | |/ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add more test entries for built-in JS types Update generated QScriptValue test files
| * Add more test entries for built-in JS typesKent Hansen2010-11-106-161/+822
| | | | | | | | | | | | | | In particular the "wrapper" types (Boolean, Number, String) were not tested at all. Reviewed-by: Jedrzej Nowacki
| * Update generated QScriptValue test filesKent Hansen2010-11-107-930/+947
|/ | | | | | | | | A couple of bugs were introduced in the generator when it was refactored; fixed now. The generated tests are now in a separate directory/class, so the test function qualifier had to be updated. Reviewed-by: Jedrzej Nowacki
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-0918-26/+517
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add autotests for setting non-Object as prototype value Revert new flaky test compile fix for namespaced Qt Ensured that the document nodes are sorted in the generated index. Make qsTr() work with Unicode (non-Latin-1) strings Add autotest that checks return value of QScriptContext::throwXXX() Improve autotest coverage of QScriptEngineDebugger Add benchmark for emitting signals from QtScript Split monolithic QtScript autotest into smaller tests
| * Add autotests for setting non-Object as prototype valueKent Hansen2010-11-092-0/+50
| | | | | | | | | | | | Currently it's possible to set the prototype to be any value, but this doesn't make sense; see QTBUG-15154. Mark test as expected failure until it's fixed.
| * Revert new flaky testKent Hansen2010-11-091-13/+0
| | | | | | | | | | Apparently this crashes on Mac. Remove for now, pending further investigation.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-0816-26/+480
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: compile fix for namespaced Qt Ensured that the document nodes are sorted in the generated index. Make qsTr() work with Unicode (non-Latin-1) strings Add autotest that checks return value of QScriptContext::throwXXX() Improve autotest coverage of QScriptEngineDebugger Add benchmark for emitting signals from QtScript Split monolithic QtScript autotest into smaller tests
| | * compile fix for namespaced Qthjk2010-11-082-1/+5
| | |
| | * Ensured that the document nodes are sorted in the generated index.David Boddie2010-11-081-2/+69
| | | | | | | | | | | | Task-number: QTBUG-13828
| | * Make qsTr() work with Unicode (non-Latin-1) stringsKent Hansen2010-11-089-9/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Converting the source string/context/comment to Latin-1 is very broken, since JS strings are UTF-16. The strings should be converted to UTF-8, which should also be the default encoding for qsTranslate(). Effectively, this bug meant that only Latin-1 characters could be used in source strings; the translations themselves could have non-Latin-1 characters. But there was data loss in the case where you passed a source string for which no translation was found (since the Latin-1-ized string would be returned). Task-number: QTBUG-14989 Reviewed-by: Jedrzej Nowacki
| | * Add autotest that checks return value of QScriptContext::throwXXX()Kent Hansen2010-11-081-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation says that they should return the error/value that was thrown. When throwError() is called from a native function call, the return value of the function will be ignored, so we need a test that calls throwError() outside of a function context. Reviewed-by: Jedrzej Nowacki
| | * Improve autotest coverage of QScriptEngineDebuggerKent Hansen2010-11-081-14/+93
| | | | | | | | | | | | | | | The internal coverage is still poor, but at least the public API has 100% coverage now.
| | * Add benchmark for emitting signals from QtScriptKent Hansen2010-11-081-0/+28
| | | | | | | | | | | | Reviewed-by: Jedrzej Nowacki
| | * Split monolithic QtScript autotest into smaller testsKent Hansen2010-11-081-0/+57
| | | | | | | | | | | | Reviewed-by: Jedrzej Nowacki
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-096-11/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed deployment for symbian/linux-armcc when using shadow builds. Started using qtmain.lib for all Qt applications, also corelib ones.
| * | | Fixed deployment for symbian/linux-armcc when using shadow builds.axis2010-11-092-5/+13
| | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | | Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-095-6/+25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also fixes the issue that 564058a1bb didn't, namely that config tests broke on Symbian. It does this by continuing to use the Open C libcrt0.lib library for non-Qt applications. This is also more correct, since you should not have to compile the Qt libs to compile a non-Qt app. Task: QTBUG-14735 RevBy: Miikka Heikkinen
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-092-3/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Really fix getting qmakespec on windows
| * | Really fix getting qmakespec on windowsaavit2010-11-092-3/+4
|/ /
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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: Task-number: QTBUG-15059
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-081-1/+1
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-081-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Task-number: QTBUG-15059
| | | * Task-number: QTBUG-15059juhvu2010-11-081-1/+1
| | |/ | | | | | | | | | | | | Removed implicit QtGui linking from qsymbianbearer plugin as it is not needed.
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-081-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Get the qmakespec correctly on all platforms
| * | Get the qmakespec correctly on all platformsaavit2010-11-081-1/+3
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-0813-163/+219
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "QPointer: assert when using QPointer on destroyed QObject" Silence warning in qvector with MSVC QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle QStyleSheetStyle: add a way to style the up arrow QPointer: assert when using QPointer on destroyed QObject Add missing Q_ENUMS to QAbstractSocket Fix QMenu rendering in the unified toolbar Add even more platform info, and make it expandable. Hide nonfunctional links, and improve html
| * | Revert "QPointer: assert when using QPointer on destroyed QObject"Olivier Goffart2010-11-081-2/+0
| | | | | | | | | | | | | | | | | | This reverts commit 96e873d4ed59bd9feef1c5dacc28f77377e53c47. Many tests where failing. (including the QWidget autotest)
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-0614-163/+221
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Silence warning in qvector with MSVC QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle QStyleSheetStyle: add a way to style the up arrow QPointer: assert when using QPointer on destroyed QObject Add missing Q_ENUMS to QAbstractSocket Fix QMenu rendering in the unified toolbar Add even more platform info, and make it expandable. Hide nonfunctional links, and improve html
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-0614-163/+221
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Silence warning in qvector with MSVC QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle QStyleSheetStyle: add a way to style the up arrow QPointer: assert when using QPointer on destroyed QObject Add missing Q_ENUMS to QAbstractSocket Fix QMenu rendering in the unified toolbar Add even more platform info, and make it expandable. Hide nonfunctional links, and improve html
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-0514-163/+221
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Silence warning in qvector with MSVC QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle QStyleSheetStyle: add a way to style the up arrow QPointer: assert when using QPointer on destroyed QObject Add missing Q_ENUMS to QAbstractSocket Fix QMenu rendering in the unified toolbar Add even more platform info, and make it expandable. Hide nonfunctional links, and improve html
| | | * | Silence warning in qvector with MSVCOlivier Goffart2010-11-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conversion from size_t to int loose precision Reviewed-by: Robin Burchell
| | | * | QStyleSheetStyle: Fix crash that occurs with several instance of ↵Olivier Goffart2010-11-053-85/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStyleSheetStyle The problem is that when a widget is destroyed, it was not properly removed from the cache. We connected the destroyed signal to a slot in the QStyleSheetStyle for the first QStyleSheetStyle that handle a widget. but if this QStyleSheetStyle is destroyed, that connection is lost. Solution: Create a new QStyleSheetStyleCaches that will be responsible to clean the caches. This objects is not destroyed as long as there is a QStyleSheetStyle instance, so the connection is not lost. I took the oportunity to move all the caches to this object. Reveiwed-by: Gabriel Task-number: QTBUG-11658
generated by cgit v0.12 at 2024-12-29 19:05:18 (GMT)