summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-0539-83/+211
|\
| * Merge commit 'origin/4.5'Olivier Goffart2009-06-045-5/+18
| |\
| | * Don't use inactivatable timers to calculate time to wait for next timer.Thomas Sondergaard2009-06-041-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | This patch prevents the eventloop from waking up needlessly. Without this patch the event loop will not sleep at all if a 0-timer is already 'inTimerEvent' Merge-request: 550 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * fix catalan plural rulesOswald Buddenhagen2009-06-032-0/+4
| | |
| | * Fix BOM for UTF-32 codecMarius Storm-Olsen2009-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The BOM was created correctly, but half of the BOM was then overwritten by the converted data afterwards. Also made the autotest also do reverse encoding tests where possible. Task-number: 255095 Reviewed-by: lars
| | * Add a note about what happens when passing 0 to qobject_cast in the docAndy Shaw2009-06-031-1/+2
| | | | | | | | | | | | Reviewed-by: Kavindra Palaraja
| * | regeneration of qfeatures.hThierry Bastian2009-06-041-0/+5
| | |
| * | add QT_NO_STATEMACHINE define so state machine can be compiled outKent Hansen2009-06-0419-0/+87
| | | | | | | | | | | | Reviewed-by: Thierry Bastian
| * | move the QT_NO_ANIMATION macro to the right place (ie after otherThierry Bastian2009-06-047-15/+15
| | | | | | | | | | | | includes)
| * | Fixed build error with Sun CC 5.5..jasplin2009-06-041-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Note that the fix is simply to swap the order of the two v_construct() overloads. Sun CC 5.5 requires the version with the default argument to occur first. Reviewed-by: TrustMe
| * | Fixed build error with Sun CC 5.5.jasplin2009-06-041-1/+8
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Doc fix: moved the cldr version outside of the double-to-string license headerDenis Dzyubenko2009-06-031-2/+2
| | |
| * | fix signal signature bug in debug outputKent Hansen2009-06-031-2/+2
| | | | | | | | | | | | | | | The signal code (first character of const char *signal) is stripped internally, so the debug output code should not skip any characters.
| * | don't require use of SIGNAL macro in calls to addTransition()Kent Hansen2009-06-031-2/+3
| | | | | | | | | | | | | | | Just as with the QSignalTransition::signal property, this makes it possible to use the function from language bindings (e.g. QtScript).
| * | fix qdoc warningKent Hansen2009-06-031-1/+1
| | | | | | | | | | | | No need to link to the class in its own doc page.
| * | use of QMutexPool to reduce the number of Q_GLOBAL_STATIC in theThierry Bastian2009-06-032-36/+40
| | | | | | | | | | | | animation framework
| * | Merged changes to the string builder class.David Boddie2009-06-021-3/+3
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Removed an ifdef in QLocale that breaks the One Definition Rule.Denis Dzyubenko2009-06-022-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From a merge request #553 by Gordon Schumacher: During a build internal to Qt, if a header included by qlocale.cpp itself includes qlocale.h, then QLOCALE_CPP will never be set. If you attempt to build qmake from its own .pro file, qmake_pch.h includes qtextstream.h, which (now) includes qlocale.h, thus causing a compile error trying to call the QSystemLocale(bool) function Inspired-by: Gordon Schumacher <gordon@rebit.com>
| * | Improve detection of monotonic timer supportBradley T. Hughes2009-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some older systems support monotonic timers, but not POSIX.1-2001. The sysconf() function is documented to return -1 if a feature is not supported, otherwise it returns a value that's dependent on it's argument. For POSIX.1-2001 compliant system, the value is 200112L, but on other systems it may just return 1, for example. Because of this, we check for the -1 return value (feature missing), instead of relying on a specific (positive) return value.
| * | Integrate merge-request #573 into branch 'master'Eskil Abrahamsen Blomfeldt2009-06-021-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | jieshuzheng (1): Remove the redundant timer kill and start when the two Request-url: http://qt.gitorious.org/qt/qt/merge_requests/573 Reviewed-by: Eskil Abrahamsen Blomfeldt <eblomfel@trolltech.com>
| | * | Remove the redundant timer kill and start when the twojieshuzheng2009-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTimer::start(int) is made in succession If you restart the QTimer like the following code snippet shows, the timer will get killed and started twice. QTimer timer; timer.start(100); timer.start(1000); Since QTimer::start(int msec) calls QTimer::setInterval(int msec), and QTimer::setInterval(int msec) will kill the timer and start another one if there is already a timer running. And QTimer::start() will do the same thing again. It is a performance penalty here. Under Windows, it will result in one extra call of SetTimer(). And under Symbian, it will result in one extra new and delete of CPeriodic and adding and removing it from AS.
| * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-022-1/+15
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| | * | Removed nested comment signature in the doc to fix a warning.Denis Dzyubenko2009-05-291-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | Fixed build issues with MSVCThierry Bastian2009-05-291-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in atomic operations, we declare Interlock... functions in the namespace That can confuse the compiler because they are also declared in another header outside the namespace. Same problem in clucene where we include windows.h from within the NS. Task-number: 254214 Reviewed-by: ogoffart
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-0219-40/+38
|\ \ \ \ | |/ / /
| * | | prepend private/ for included private headersMartin Jones2009-06-0110-10/+10
| | |/ | |/|
| * | Merge branch 'review/master'Marius Bugge Monsen2009-05-298-27/+25
| |\ \
| | * | Fix compilation with -pedanticDavid Faure2009-05-297-24/+24
| | | |
| | * | Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-29113-415/+12481
| | |\ \
| | * | | static method, no instance neededDavid Faure2009-05-291-1/+1
| | | | |
| | * | | Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-225-1185/+49
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-211-3/+4
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://gitorious.org/qt/qtDavid Faure2009-05-2015-115/+124
| | |\ \ \ \ \
| | * | | | | | remove unused line (the function is even in qtgui nowadays)David Faure2009-05-181-2/+0
| | | | | | | |
| * | | | | | | Doc - some changes to fix a qdoc warningKavindra Devi Palaraja2009-05-291-2/+2
| | | | | | | |
| * | | | | | | Fix qstringbuilder documentation.hjk2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was using !fn instead of \fn accidentally.
* | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-2936-138/+622
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fixed compile with MinGW.Rohan McGovern2009-05-291-3/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | MinGW 3.4.5 can't figure out the automatic QLatin1Char -> QString conversion in this code.
| * | | | | | Export symbol needed by the declarative module.Michael Brasser2009-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Leo
| * | | | | | Introduce a new class QStringBuilder to speed up the creation ofhjk2009-05-285-3/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString objects from smaller chunks. The QStringBuilder class: QStringBuilder uses expression templates (using the '%' operator) to postpone any actual concatenation until it is assigned to an actual QString. At that time it knows the exact sizes of all chunks, can compute the required space, allocates once a QString of appriopriate size and then copies over the chunk data one-by-one. In addition, QLatin1Literal is a drop-in replacement for QLatin1String (which we can't change for compatibility reasons) that knows its size, therefore saving a few cycles when computing the size of the resulting string. Some further saved cycles stem from inlining and reduced reference counting logic (the QString created from a QStringBuilder has typically ref count equal to 1, while QString::append() needs an extra test) Minor changes to the existing QString class: - Introduce QString constructor to create an uninitialized QString of a given size. This particular constructor is used by QStringBuilder class. - Introduce a QT_USE_FAST_CONCATENATION macro to disable the existing overloads of operator+() and helps finding the places where they are used in code. - Introduce QT_USE_FAST_OPERATOR_PLUS. This also disables the existing overloads of operator+() and creates a new templated operator+() with identical implementation of operator%(). This allows code that is compilable QT_CAST_{TO,FROM}_ASCII to use QStringBuilder almost transparently. The only case that is not covered is creating objects like QUrl that are implicitly constructible from a QString from a QStringBuilder result. This needs to be converted explicitly to a QString first, e.g. by using QUrl url(QString(QLatin1String("http://") + hostName)); Reviewed-by: MariusSO
| * | | | | | Compile fix with namespaces.hjk2009-05-281-2/+0
| | | | | | |
| * | | | | | QStateMachine: better way to get the sender signalIndexOlivier Goffart2009-05-281-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QObject internals have changed, and the mutex that need to be locked to access the senders list is not the same anymore, and not accessible form qstatemachine.cpp But we do not need to loop over the senders list anyway because this is done in sender() We also do not need to lock in order to access the currentSender Reviewed-by: Eskil
| * | | | | | improved string operations all over the placeThierry Bastian2009-05-289-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used character operations whenever possible better usage of QLatin1String
| * | | | | | Use Qt::UniqueConnection instead of disconnect/connectOlivier Goffart2009-05-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix an issue in QTreeView where a signal could be connected several times Reviewed-by: Thierry
| * | | | | | Compile qstatemachine autotestOlivier Goffart2009-05-281-1/+1
| | | | | | |
| * | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-278-37/+135
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| | * | | | | Fixed aliasing pointer corruption in QDataStream.Trond Kjernaasen2009-05-271-15/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a union instead of an unsafe cast when swapping the bytes in the QDataStream streaming operators. The old seems to cause problems with Link Time Code Generation optimizations with the MSVC compilers. Task-number: 247708 Reviewed-by: Samuel Reviewed-by: Thiago BT: yes
| | * | | | | qdoc: Indicate what iterator_categor means for container classes.Martin Smith2009-05-262-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 245501
| | * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-263-5/+12
| | |\ \ \ \ \
| | | * | | | | Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me