summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-161-3/+28
| | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments.
* Don't sendPostedEvents() twice when calling processEvents() manuallyBradley T. Hughes2009-11-161-6/+6
| | | | | | | | | Commit fe0f807e1f4e7510c6d8cddd848bcbc25e358651 could cause sendPostedEvents() to be called twice, which caused regressions in tests/auto/qtimer. Fix this by only calling sendPostedEvents() "manually" if we didn't see a WM_QT_SENDPOSTEDEVENTS message. Reviewed-by: Prasanth Ullattil
* Fix compilation on solaris-g++-64.Thiago Macieira2009-11-131-0/+1
| | | | | | | | Add the "reserved" member to QVectorData in that configuration. Since this is only about the bootstrapped version of Qt, there are no binary compatibility issues. Reviewed-by: Bradley T. Hughes
* Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-132-9/+9
|\
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-132-9/+9
| |\
| | * Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-112-9/+9
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbrush.cpp
| | | * Fix docs for animation apiLeonardo Sobral Cunha2009-11-092-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All animation api code snippets should use references instead of local variables. Task-number: QTBUG-5616 Reviewed-by: thierry
| * | | Merge commit 'c785d92153d23b836451b0643424b9871bcc4be9' into 4.6-upstreamBradley T. Hughes2009-11-131-0/+5
| |\ \ \
* | | | | doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-131-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments.
* | | | | Merge commit 'coreteam/4.6' into oslo1-4.6Marius Storm-Olsen2009-11-133-16/+17
|\ \ \ \ \
| * | | | | utils/qlalr generator: adapt changes to xmlstream and script filesPeter Hartmann2009-11-113-16/+17
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some changes were made to qxmlstream_p.h and script files directly; however, those files are generated automatically by src/corelib/xml/make-parser.sh and src/script/parser/make-parser.sh, respectively, so the generator would overwrite the manual changes to the files the next time it is run. This patch integrates those changes into the generator rather than into the files directly. Reviewed-by: Roberto Raggi Reviewed-by: Olivier Goffart
* | | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-121-0/+20
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-121-0/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/corelib/tools/qscopedpointer_p.h src/gui/widgets/qlcdnumber.cpp
| | * | | | make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| | * | | | Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-114-65/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
| | * | | | compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signature of QT_OPEN to be the same on all platforms. Reviewed-by: thartman
| | * | | | Add error handling for SetTimer() with the sentinel timer idBradley T. Hughes2009-11-111-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If SetTimer() fails when trying to delay sendPostedEvents(), emit a warning and try to continue. Reviewed-by: mauricek
| | * | | | Make QScopedPointer::operator== and != non-memberJoão Abecasis2009-11-111-40/+12
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-member operator allows implicit conversions on both arguments. A single operator is enough to support QScopedArrayPointer, QCustomScopedPointer and QScopedSharedPointer since equality semantics don't change and the deleter is managed in the base class. Reviewed-by: Marius Storm-Olsen
* | | | | Merge branch '4.6' into osloStaging1-4.6Jocelyn Turcotte2009-11-121-21/+22
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | QUrl::fromUserInput: improvements, corrections and make the demoJocelyn Turcotte2009-11-121-21/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | browser use it. - Handle windows files names by looking for paths first (and don't check that it exists first) - Handle host names without dots (it was not handled because of difficulties with the case host:port) - Return the parsed url only if the host or the path is not empty instead of returning a url that looks like "http:" Reviewed-by: Thiago Macieira
* | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-126-66/+139
|\ \ \ \ | |/ / /
| * | | Doc: fix typoVolker Hilsheimer2009-11-111-1/+1
| | |/ | |/| | | | | | | Fixes: QTBUG-5167
| * | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-111-3/+11
| |\ \
| * \ \ Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-118-200/+242
| |\ \ \
| | * \ \ Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-104-65/+134
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| | | * | | Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-094-85/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
| * | | | | make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| * | | | | compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-091-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Changed the signature of QT_OPEN to be the same on all platforms. Reviewed-by: thartman
* | | | | Make sure posted events are always sent when calling processEvents() on Win32Bradley T. Hughes2009-11-111-0/+5
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 31f1ff910, posted events could be delayed by a previous call to processEvents(). This causes some tests to randomly fail, so bring back the invariant that processEvents() will always call sendPostedEvents() when called "manually" (i.e. not from exec()). Reviewed-by: Prasanth Ullattil
* | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-101-40/+12
|\ \ \ \ | | |/ / | |/| |
| * | | Make QScopedPointer::operator== and != non-memberJoão Abecasis2009-11-101-40/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Non-member operator allows implicit conversions on both arguments. A single operator is enough to support QScopedArrayPointer, QCustomScopedPointer and QScopedSharedPointer since equality semantics don't change and the deleter is managed in the base class. Reviewed-by: Marius Storm-Olsen
* | | Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-094-95/+96
|\ \ \ | |/ /
| * | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-093-5/+18
| |\ \
| | * | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-063-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| * | | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-091-90/+78
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/qfsfileengine.cpp tests/auto/qfile/tst_qfile.cpp
| | * | Remove 4k-chunking in QFSFileEngine::read/writeFdFhJoão Abecasis2009-11-041-85/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a serious performance issue on Symbian and not necessarily optimal on other platforms. For the time being, we'll allow the OS to read/write as much as it can. Otherwise cleaned up the code, adding checks for invalid len arguments. Task-number: QT-2347 Reviewed-by: Peter Hartmann
* | | | Add error handling for SetTimer() with the sentinel timer idBradley T. Hughes2009-11-091-3/+11
|/ / / | | | | | | | | | | | | | | | | | | If SetTimer() fails when trying to delay sendPostedEvents(), emit a warning and try to continue. Reviewed-by: mauricek
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-0629-223/+272
|\ \ \
| * | | Fix a signed/unsigned comparison warningJoão Abecasis2009-11-061-1/+1
| | | |
| * | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-0612-136/+142
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * \ \ Merge branch 'feature' into 4.6Jørgen Lind2009-11-062-0/+4
| | |\ \ \
| | | * | | Fix QT_NO_DATESTRINGJørgen Lind2009-11-062-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | * | | | Merge branch '4.6-s60' into 4.6axis2009-11-061-1/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-052-0/+12
| | | |\ \ \
| | | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0412-210/+101
| | | |\ \ \ \
| | | * | | | | Fix compile error for Symbian WINSCW emulatorShane Kearns2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Iain
| | * | | | | | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-063-7/+6
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-065-125/+121
| | | |\ \ \ \ \ \
| | | * | | | | | | add support for the N'Ko writing system to QtLars Knoll2009-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables N'Ko support in Qt, after having now a harfbuzz version that supports it. Task-number: QTBUG-1042 Reviewed-by: Gunnar
| | | * | | | | | | fix painting on Windows CEMaurice Kalinowski2009-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it seems the timer id ~0 is already used on windows ce or not available at all. This has caused Qt to not receive the timer messages, causing to not update. Task-number: qtbug-5496 Reviewed-by: Gunnar Sletta
generated by cgit v0.12 at 2025-01-21 11:10:27 (GMT)