summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-019-1/+22
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Examples: Fix compilation with namespaces.
| * Examples: Fix compilation with namespaces.ck2010-06-019-1/+22
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-012-19/+17
|\ \ | |/ | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: remove 'double' content view from window, second try
| * Cocoa: remove 'double' content view from window, second tryRichard Moe Gustavsen2010-06-012-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | Up til now, we always used to create a new NSView for a top level widget, and make it a child of the windows content view. This is/should be unnecessary, as NSWindow has a method for setting the content view directly, thereby allowing for reducing the stacking level with one view. Not the biggest gain if the year, but it seems effortless to implement. And I do it as a part of Alien preparation. Rev-By: msorvig
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-312-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Cocoa: remove 'double' content view from window" Cocoa: fix broken drawers after content view structure change Cocoa: remove 'double' content view from window Revert the change in applicationShouldTerminate().
| * Revert "Cocoa: remove 'double' content view from window"Richard Moe Gustavsen2010-05-311-15/+18
| | | | | | | | | | | | This reverts commit 5cdafc956f6f2e18012b31d68851150d89d7e577. Reason: Broke some autotests (qgl, qglversioncheck). It needs some more investigation.
| * Cocoa: fix broken drawers after content view structure changeRichard Moe Gustavsen2010-05-311-0/+2
| | | | | | | | | | After setting top level widget views as content views in windows directly, the function this patch fixes, broke.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-312-19/+15
| |\ |/ / | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Cocoa: remove 'double' content view from window Revert the change in applicationShouldTerminate().
| * Cocoa: remove 'double' content view from windowRichard Moe Gustavsen2010-05-311-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | Up til now, we always used to create a new NSView for a top level widget, and make it a child of the windows content view. This is/should be unnecessary, as NSWindow has a method for setting the content view directly, thereby allowing for reducing the stacking level with one view. Not the biggest gain if the year, but it seems effortless to implement. And I do it as a part of Alien preparation. Rev-By: msorvig
| * Revert the change in applicationShouldTerminate().Fabien Freling2010-05-311-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
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-312-3/+13
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Changes: add patch for artificial emboldening
| * | Changes: add patch for artificial emboldeningMike FABIAN2010-05-312-3/+13
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Details: Fixes http://bugreports.qt.nokia.com/browse/QTBUG-10596 Patch taken from https://bugzilla.novell.com/show_bug.cgi?id=374066 https://bugzillafiles.novell.org/attachment.cgi?id=232442 and http://code.google.com/p/gentoo-taiwan/source/browse/trunk/x11-libs/qt-gui/files/synthetic-bold-4.5.diff?spec=svn298&r=298 and slightly edited. Moving the two lines concerning the underlining is unrelated to the emboldening but seems to make sense anyway, the comment "//underline metrics" seems to be misplaced before the "if (FT_IS_SCALABLE(face)) {| The hunk: @@ -789,6 +794,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyphMetrics(QGlyphSet *set, uint glyph } FT_GlyphSlot slot = face->glyph; + if (embolden) FT_GlyphSlot_Embolden(slot); int left = slot->metrics.horiBearingX; int right = slot->metrics.horiBearingX + slot->metrics.width; int top = slot->metrics.horiBearingY; seems to be logical but it is apparently not used when running my test program, i.e. synthetic emboldening in my test program works even without this hunk. Task-number: QTBUG-10596 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-2811-75/+100
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Avoid sending deprecated Qt3Support events if the application was built without Qt3Support Make QWeakPointer and QSharedPointer movable Speedup destruction of QObject if the eventloop is not entered.
| * | Avoid sending deprecated Qt3Support events if the application was built ↵Olivier Goffart2010-05-288-37/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without Qt3Support - Detect if the application was built using Qt3Support using the QApplication's constructor internal flags. - Move that from QApplication to QCoreApplication. - Do not send the event if the application was not built with Qt3Support Reviewed-by: Brad
| * | Make QWeakPointer and QSharedPointer movableOlivier Goffart2010-05-282-3/+11
| | | | | | | | | | | | | | | | | | For making QVector of them faster. Reviewed-by: Thiago
| * | Speedup destruction of QObject if the eventloop is not entered.Olivier Goffart2010-05-284-35/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QObjectPrivate::removePendingChildInsertedEvents intoduce O(n^2) complexity. Remove this function and instead check the object has not been removed/reparented Known side effects: if the object would be parented multiple times to the same object, multiple QEvent::ChildInserted will be sends This would also create the QWeakPointer external refcount for almost each objects. Task-number: QTBUG-6546 Reviewed-by: Brad
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-284-6/+17
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix for tst_qfiledialog2 to distinguish between C: and C:/ make QFileSystemModel::rmdir(dir) remove dir from fileInfoGatherer make QFileSystemWatcher_win distinguish C: from C:\ make QFileSystemModel distinguish C: from C:\
| * | fix for tst_qfiledialog2 to distinguish between C: and C:/Zeno Albisser2010-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is needed because the qfiledialog uses just "C:" to display the drive entry. But "C:" in fact does not point to the drive root necessarily. Therfor qfiledialog now appends a slash, but the unit test did not expect that. Reviewed-by: TrustMe
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-273-4/+15
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make QFileSystemModel::rmdir(dir) remove dir from fileInfoGatherer make QFileSystemWatcher_win distinguish C: from C:\ make QFileSystemModel distinguish C: from C:\
| * | make QFileSystemModel::rmdir(dir) remove dir from fileInfoGathererZeno Albisser2010-05-272-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise directories cannot be deleted as long as they are watched, since the fileInfoGatherer keeps a QFileInfo object with open file handles. Reviewed-by: Joao Task-number: QTBUG-8241
| * | make QFileSystemWatcher_win distinguish C: from C:\Zeno Albisser2010-05-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now support this in QFileInfo, we also need to support this in QFileSystemWatcher. Otherwise the changes in a watched root folder would not get detected. Reviewed-by: Joao Task-number: QTBUG-8241
| * | make QFileSystemModel distinguish C: from C:\Zeno Albisser2010-05-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since QFileSystemModel just uses a C: to represent C:\ for esthetics, we now need to append a slash to make sure we do not accidently point to the current working directory on C:\. Reviewed-by: Joao Task-number: QTBUG-8241
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-2617-208/+447
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Improved documentation for QSharedMemory's key/setKey functions. Added native key support to QSharedMemory API. Make test work with shadow builds again. Added QThreadPool::waitForDone(int msecs) Add support of high unicodes in QUrl. QComboBox::modelColumn was not respected when selecting an item
| * | Improved documentation for QSharedMemory's key/setKey functions.Andreas Aardal Hanssen2010-05-261-27/+37
| | |
| * | Added native key support to QSharedMemory API.Mirko Damiani2010-05-267-65/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods setNativeKey() and nativeKey() were added to QSharedMemory API. Shared memory's native key is returned by nativeKey() and it is set with either setKey() or setNativeKey(). setKey() leads to a native key that is platform independent while setNativeKey() directly sets the native key without any mangling. When using setNativeKey(), key() returns a null string and shared memory's system semaphore is not set. This means that is up to the user to define a such protection mechanism (i.e. lock() can't be used on native keys). QSharedMemory tests were updated. Merge-request: 1497 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | Make test work with shadow builds again.Andreas Aardal Hanssen2010-05-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Broken by 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c, which assumes the binary and sources are in the same directory. The fix reverts the code back to how it was in 4.5 (where it still works with shadow builds). Reviewed-by: Denis Dzyubenko
| * | Added QThreadPool::waitForDone(int msecs)Thomas Sondergaard2010-05-264-4/+60
| | | | | | | | | | | | | | | | | | | | | Merge-request: 641 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-by: Morten Sorvig Task-number: QTBUG-2695
| * | Add support of high unicodes in QUrl.Ritt Konstantin2010-05-263-133/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some typos in the test data (all 3 typos are already fixed in the original testsuite). Add incorrect utf-8 data (sub)test from nameprep testsuite. Reviewed-by: Andreas Merge-Request: 605 Merge-request: 605 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | QComboBox::modelColumn was not respected when selecting an itemGabriel de Dietrich2010-05-263-4/+30
| | | | | | | | | | | | | | | | | | | | | Auto-test included Reviewed-by: Olivier Task-number: QTBUG-10491
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-254-17/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix tst_QComboBox::maxVisibleItems() auto-test on Mac Use binarysort to find items. QComboBox: Fix documentation and make auto-test pass.
| * | Fix tst_QComboBox::maxVisibleItems() auto-test on MacGabriel de Dietrich2010-05-251-1/+3
| | | | | | | | | | | | Reviewed-by: Olivier
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-254-17/+34
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use binarysort to find items. QComboBox: Fix documentation and make auto-test pass.
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-214-17/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use binarysort to find items. QComboBox: Fix documentation and make auto-test pass.
| | * | Use binarysort to find items.Gunnar Sletta2010-05-212-14/+29
| | | | | | | | | | | | | | | | | | | | Task: http://bugreports.qt.nokia.com/browse/QTBUG-231 Reviwed-by: Eskil
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-212-3/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QComboBox: Fix documentation and make auto-test pass.
| | | * | QComboBox: Fix documentation and make auto-test pass.Gabriel de Dietrich2010-05-212-3/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
* | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-05-251557-33870/+44053
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (100 commits) Fixed compile with xlC. Added autotest for Component.createObject() without Qt.createComponent() Compiler warning Remove incorrect ASSERT Be slightly more verbose on assigning undefined in binding. Doc fixes Don't crash when assigning a Behavior to a grouped property. Get rid of 'noise' when using GL and the top-level item is an Item. Fix visual tests after rename of the qml executable. Do not attempt to setParent of object in a different thread Don't polish QDeclarativeItems. Check QML files for license headers too. Make compile: include script module for test Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivate Allow resource files to be loaded in WorkerScript Fix TextEdit alignment. Component::createObject() don't attempt to set parent of null object Factor out initialization effects from declarative benchmarks. Remove license headers from test data. Fix warnings ...
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-251557-33870/+44053
| |\ \ \ \ |/ / / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-251-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compile with xlC.
| | * | | | Fixed compile with xlC.Rohan McGovern2010-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When given `flags |= foo | bar;', where `flags' is a bitfield, xlC says: The bit-field "flags" cannot be bound to a non-const reference `flags |= foo; flags |= bar;' works.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-248-8/+60
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Added autotest for Component.createObject() without Qt.createComponent()
| | * | | | | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-248-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also augmented the docs for both functions a little. Task-number: QTBUG-10926
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2415-30/+80
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compiler warning Remove incorrect ASSERT Be slightly more verbose on assigning undefined in binding. Doc fixes Don't crash when assigning a Behavior to a grouped property. Get rid of 'noise' when using GL and the top-level item is an Item. Fix visual tests after rename of the qml executable. Do not attempt to setParent of object in a different thread Don't polish QDeclarativeItems.
| | * | | | | Compiler warningAaron Kennedy2010-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-10816
| | * | | | | Remove incorrect ASSERTAaron Kennedy2010-05-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-10832
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-248-10/+48
| | |\ \ \ \ \
| | | * | | | | Doc fixesYann Bodson2010-05-242-5/+5
| | | | | | | |
| | | * | | | | Don't crash when assigning a Behavior to a grouped property.Michael Brasser2010-05-244-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10799 Reviewed-by: Aaron Kennedy
| | | * | | | | Get rid of 'noise' when using GL and the top-level item is an Item.Michael Brasser2010-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10911
| | | * | | | | Fix visual tests after rename of the qml executable.Michael Brasser2010-05-241-3/+3
| | | | | | | |
generated by cgit v0.12 at 2025-02-10 14:53:59 (GMT)