summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-12-0231-42/+592
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf 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.qdocconf
| * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-0217-21/+137
| |\
| | * Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-12-0210-13/+129
| | |\
| | | * Fix crash in QVector::reserve when reserving smaller size on a shared vectorOlivier Goffart2009-12-011-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot call realloc with aalloc smaller than asize. Also include obvious optimisation: take the qMin computation out of the loop. Task-number: QTBUG-6416 Reviewed-by: Thiago
| | | * Extended tst_QListView::indexAt to test viewport bounds.Gabriel de Dietrich2009-12-011-1/+9
| | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | | * Fix QFontCombobox autotest on X11Olivier Goffart2009-12-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On X11, Font might have a foundry within bracket. This foundry is set by the font combobox, and makes the font comparison fail. Make sure the other attributes (size, bold, ...) are preserved when the font is changed. Reviewed-by: Gabriel
| | | * Fix tst_qsharedmemory on UnixOlivier Goffart2009-11-301-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | executable does not end with .exe on Unix, while it is valid to call the executable without the .exe on windows Reviewed-by: Joao
| | | * Only call updateFont if the font have changed.Alexis Menard2009-11-301-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When receiving the polish event, we call updateFont only if the font has changed (from the QApplication::font()). This avoid to clear sizeHints cache. Task-number:QTBUG-6272 Reviewed-by:janarve
| | | * Do not recoginze templated types or pointers as flags.Olivier Goffart2009-11-302-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those types can never by flags. This fixes QML as they do not use Q_DECLARE_METATYPE in a way visible to moc. Patch by Aaron Kennedy Reviewed-by: Kent Hansen
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-301-1/+1
| | | |\ | | | | | | | | | | | | | | | 4.6-staging2
| | | | * Fix tst_qspinbox compilation with winscw.Liang Qi2009-11-271-1/+1
| | | | |
| | | * | Merge commit 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-2712-38/+158
| | | |\ \
| | | * | | compile fix for autotestThierry Bastian2009-11-271-2/+5
| | | | | |
| | | * | | compile fix for autotestThierry Bastian2009-11-271-1/+5
| | | | | |
| | | * | | Merge branch 'fixes' of ↵Jan-Arve Sæther2009-11-271-0/+41
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into fleury-fixes Conflicts: tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
| | | | * | | QGAL: default spacing can be unset using a negative valueEduardo M. Fleury2009-11-251-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a default spacing is set through QGAL::setSpacing() family of methods, the user must be able to unset it. To avoid adding another public method, we enabled this feature by allowing a negative value to be passed to those methods. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Anselmo Lacerda S. de Melo <anselmo.melo@openbossa.org>
| | | | * | | QGAL: sizeHint constraints needed by anchors parallel with the layoutEduardo M. Fleury2009-11-251-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method "constraintsFromSizeHints" does not create constraints for anchors between the layout vertices _only if_ these anchors have infinite maximum sizes. However, this test was not being done for half-anchors, ie. those created when the layout center anchorage point is used. That was OK when there was no chance that the center anchors had been simplified by a parallel anchor. Nowadays there's a chance that happens, so the test was extended. Commit also adds a test to avoid regressions. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
| | | | * | | QGAL: deal correctly with anchors in parallel with the layoutCaio Marcelo de Oliveira Filho2009-11-251-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the preferred size calculation, we should not add 'layout anchors' (either one or the two halves) into the objective function, since the layout doesn't impose or prefer any size at all. This already worked for cases when the layout anchor is one, but not when we have two halves. The mechanism was a 'skipInPreferred' flag that were not being set. The flag is pretty much redundant right now, since we can get this information from the 'isLayoutAnchor' flag. So, the flag was removed and a test was added for both a parallel case with the entire layout and other with half of the layout (which wasn't passing before). Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * | | | | Bump version to 4.6.1Jason McDonald2009-12-017-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | Fixes a crash on Mac with QFileInfo.Denis Dzyubenko2009-11-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | realpath() crashes on mac if the input file path is the root ("/") - on 10.6 calling a free on the returned value shows a warning saying the memory was not allocated. To workaround that just added a special case - if the input string is '/', we don't need to use realpath as we already know that the path is canonical. Reviewed-by: Prasanth
| * | | | | | Unix: Avoid stat() when opening a fileMarkus Goetz2009-11-301-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The open() syscall can open directories for reading, which we in QFile and file engines don't support. However, there is no need for stat() to find out if it is a directory if we open() with a write flag because then the syscall will fail anyway. Reviewed-by: joao
| * | | | | | Fix garbage collection issue with script-owned objects with connectionsKent Hansen2009-11-301-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reinstates the pre-4.6 behavior: A script-owned C++ object that's not referenced anymore should be garbage collected, even if it has connections. In order to achieve this, the "weak" reference to the C++ object's wrapper must be invalidated. Task-number: QTBUG-6366 Reviewed-by: Simon Hausmann
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-2917-28/+389
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-272-0/+22
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | add qph autotestOswald Buddenhagen2009-11-252-0/+22
| | | | | | |
| | * | | | | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-2715-28/+367
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Fixed non-compiling Q*SpinBox auto-testsGabriel de Dietrich2009-11-272-2/+4
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Reviewed-by: Olivier
| | | * | | QSortProxyModel: Crash when changing model with 2-level proxy and selected itemsGabriel de Dietrich2009-11-261-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The index mapping to the base model was being cleared before the persistant model indices. Reviewed-by: Olivier Task-number: QTBUG-6237
| | | * | | Don't crash via proxy model when moving QModelIndexesStephen Kelly2009-11-261-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The layoutAboutToBeChanged signal gives proxies a chance to persist QModelIndexes. The d->itemsAboutToBeMoved method is part of the process of moving the persistent indexes. d->itemsAboutToBeMoved must be called after layoutAboutToBeChanged. Otherwise persistent indexes will not be updated. Merge-request: 2219 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-261-0/+38
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | * | | Fixed crash when scrolling with deleted backingstoreJanne Koskinen2009-11-251-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian we save memory by deleting widget backingstore from non-visible windows. 12-key FEP is fullscreen and causes the backing store to be deleted but still continues to scroll the view to show current caret position in focused lineedit control. Task-number: QTBUG-5922 Reviewed-by: Jason Barron
| | | * | | | Fix a crash in KDE/Plasma with QGraphicsView. TopLevel list of itemsAlexis Menard2009-11-261-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was corrupted. This nasty bug was triggered when the index sort the top level list of items. We forgot to set the flag topLevelSequentialOrdering to false so when an item was removed from the top level list it was using the sibling index which can be not valid anymore since the list is not sorted by sequential order. So it let some dangling pointers in the list which make processDirtyItemRecursive crash the next paint event. Reviewed-by:bnilsen Reviewed-by:andreas
| | | * | | | QGraphicsTextItem::setDefaultTextColor check change before calling update()Olivier Goffart2009-11-261-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some applications call setDefaultTextColor in the paint event. Task-number: QTBUG-6242 Reviewed-by: Gabriel
| | | * | | | Optimize QObjectPrivate::isSignalConnectedOlivier Goffart2009-11-261-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can be seen in the GraphicsView benchmark. This function has to be as fast as possible. Make the function inline. We do not need 64bit for the connectedSignals bit array because it is very unlikely that an object will have more than 32 signals. (In Qt 4.5 it could have hapenned as the slot were counting in the index) Reviewed-by: bnilsen Reviewed-by: Brad
| | | * | | | autotest fix: mac shows sizegrip when window is maximizedThierry Bastian2009-11-251-0/+5
| | | | | | |
| | | * | | | Make the spinbox and doublespinbox better accept intermediate inputThierry Bastian2009-11-252-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5008 Reviewed-by: ogoffart
| | | * | | | Fix RCC testOlivier Goffart2009-11-251-2/+2
| | | | | | |
| | | * | | | fix languagechange testOlivier Goffart2009-11-251-1/+2
| | | | | | |
| | | * | | | Test for the clipboard presence in autotestThierry Bastian2009-11-251-0/+14
| | | | | | |
| | | * | | | stabilize tests on X11Olivier Goffart2009-11-253-16/+22
| | | | | | |
| | | * | | | Merge commit 'upstream/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-256-37/+89
| | | |\ \ \ \
| | | * | | | | skip one test on mac because it uses native menu barsThierry Bastian2009-11-251-0/+3
| | | | | | | |
| * | | | | | | QNetworkReply autotest: adapt to QNetworkCookieJar changePeter Hartmann2009-11-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with commit 0d20ec8604b318ceafd6c35dfe1d73519bf024d3 I changed QNetworkCookieJar behavior, this commit adapts the QNetworkReply autotest to it. Reviewed-by: TrustMe
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-277-1/+268
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | On Mac OS X, QLineEdit should handle MoveToStart/EndOfBlockBenjamin Poulain2009-11-261-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac OS X, with a QLineEdit, QKeySequence::MoveToStartOfBlock should move the cursor to the beginning of the input, and QKeySequence::MoveToEndOfBlock to the end of the block Same for selection. The shortcuts also had to be updated. Task-number: QTBUG-4679 Reviewed-by: Olivier Goffart
* | | | | | | | fix QKeySequence::fromStringChani Armitage2009-12-021-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now emacs-style shortcuts are parsed correctly, like in the constructor, and they share the code too. Merge-request: 1279 Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
* | | | | | | | Fix certain type-const-ref syntax not recognized by normalizedSignature()Bradley T. Hughes2009-11-304-9/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally, const Type & is normalized to just Type, but this didn't work for Template<T>const& or Type*const& types. This now works as expected. However, this changes the way these types are normalized, and existing code using the old syntax will break. We can prevent this breakage by also normalizing the method signature in the metaobject when looking up signals and slots in QObject::connect(). I have added an autotest for this, which includes moc output generated by Qt 4.6's moc. This means we need to bump the metaobject revision number even though we are not adding any new data (only changing the normalized strings we store). Task-number: QTBUG-2407 Task-number: QTBUG-3722 Reviewed-by: ogoffart
* | | | | | | | Adjust documentation on QCombobox::maxVisibleItems to mention that this does ↵Olivier Goffart2009-11-301-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not work with gtk. Also fixed the fact that it would show one item to many. Task-number: QTBUG-760 Reviewed-by: jbache
* | | | | | | | support @-style list files on the command lineOswald Buddenhagen2009-11-266-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4099
* | | | | | | | Merge branch '4.6'Thiago Macieira2009-11-2596-312/+4076
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri