summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Initialize the time structure in QTime::currentTime()Benjamin Poulain2009-06-291-2/+1
| | | | | | | | In QTime::currentTime(), the pointer to the tm structure was used without being initialized. Task-number: 256889 Reviewed-by: Markus Goetz
* Merge branch '4.5'Thiago Macieira2009-06-282-5/+9
|\
| * Fix detection of the ELF interpreter on Linux.Thiago Macieira2009-06-282-5/+9
| | | | | | | | | | | | The path /lib/ld-linux.so.2 is correct for i386 only, possibly some other archs. But on x86-64, it's usually ld-linux-x86-64.so and it can be in either /lib or /lib64.
* | Fixed a gcc 4.4 warning on switching a value outside the enum.Thiago Macieira2009-06-262-8/+13
| | | | | | | | | | These four enum values are used in variables of type Section, but aren't in it. With gcc 4.4, it displays a warning that the value is lower than the lowest value
* | De-export the ThreadEngineBarrier class and de-inline the call to acquire.Morten Sørvig2009-06-262-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ThreadEngineBarrier was implemented in the header as ThreadEngineSemaphore in Qt 4.4 and Qt 4.5, and exported for a brief time in the Qt master branch. ) Unfortunately the inline call to acquire means that applications compiled with Qt 4.4. and Qt 4.5 will contain a copy of the old implementation. This is BC as long as the memory layout of the ThreadEngineBarrier class stays the same, which means that we keep the QMutex member variable. The old version of acquire will no longer be thread-safe since the new version doesn't lock the mutex, but this is fortunately not a problem; the only place it's called is in startAsynchronously() before the worker threads are started.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-57/+19
|\ \
| * | Clean up QSharedPointer cast implementations.Thiago Macieira2009-06-261-57/+19
| | | | | | | | | | | | | | | | | | | | | There's no need to have separate cast-checker functions, plus the cast- and centralise the function to create the object. Reviewed-by: TrustMe
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-262-2/+31
|\ \ \ | |/ /
| * | Add some macro expressions to qglobal.h for typeof, alignof and aligned().Thiago Macieira2009-06-261-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | These expressions aren't used anywhere yet, but I am sure we will find use for them very soon now. I checked the compiler manuals for the three commercial Unix compilers to verify which versions support these macros. Reviewed-by: Bradley T. Hughes
| * | QVariant::setValue had a bug when changing its typeThierry Bastian2009-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | If it was shared and you then set it back to an int type, it is still marked as shared,. This might even lead to crashes. The patch was sent through gitorious by Jürgen Starek. Note: autotest added as well
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-1/+7
|\ \ \ | |/ /
| * | Merge branch '4.5'Thiago Macieira2009-06-261-1/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
| | * make invokable constructors work with classes in namespaceKent Hansen2009-06-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the fully qualified classname at relevant places in the moc-generated code. Also, QMetaObject::newInstance() needs to strip the namespace part, since the constructor signatures don't contain the fully qualified name. Task-number: 246064 Reviewed-by: Simon Hausmann
| | * Bump Qt version number.Jason McDonald2009-06-251-2/+2
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-263-3/+7
|\ \ \ | |/ /
| * | Merge branch '4.5'Thiago Macieira2009-06-252-2/+6
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
| | * Change QSharedPointer to track (or not) pointers when the #define isThiago Macieira2009-06-252-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. This allows mixing of debug and non-debug code (possible on Unix systems) without causing assertion failures. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * | don't crash when QTextCodec::codecForUtfText() is passed -1 bytesKent Hansen2009-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible that the function gets called with a bytearray of size -1 (for example, by QTextStreamPrivate::fillReadBuffer()). Since the size was erroneously cast to a uint, the subsequent comparison (arraySize > 3) succeeded and caused a crash. Reviewed-by: Denis Dzyubenko
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-253-6/+5
|\ \ \ | |/ /
| * | Add Q_CORE_EXPORT to ThreadEngineBarrierRhys Weatherley2009-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The ThreadEngine template uses functions from ThreadEngineBarrier, so ThreadEngineBarrier must be exported to other libraries/programs that instantiate the template. Reviewed-by: trustme
| * | Merge branch '4.5'Thiago Macieira2009-06-242-5/+4
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| | * Fix comparison of different-sized QStringRefs.Thiago Macieira2009-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | Two strings are only equal if they have the same size. Task-number: 256763 Reviewed-by: TrustMe
| | * Remove these outdated referencesNorwegian Rock Cat2009-06-231-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't work, the paths are wrong. It's not properly checking the arch, and none of our compilers use it. Unsupported ones might, but I'd rather leave it blank and let them figure out how to do it correctly then lead them down a blind alley. Discussed with Morten Sørvig
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-2413-206/+202
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| * | Rename ThreadEngineSemaphore -> ThreadEngineBarrierMorten Sørvig2009-06-242-85/+93
| | | | | | | | | | | | Also move the implementation to the .cpp file.
| * | Improve QtConcurrent scalability.Morten Sørvig2009-06-241-24/+62
| | | | | | | | | | | | | | | Reduce lock contention QtConcurrent by swiching the ThreadEngineSemaphore class over to a QAtomic-based implementation.
| * | Improve QThreadPool scalability.Morten Sørvig2009-06-241-2/+8
| | | | | | | | | | | | | | | | | | Reduce lock contention: - Skip locking in the accessor functions (where we can) - exit early in tryStart (before locking the mutex) when the threadpool is running at max capacity.
| * | QXmlStreamWriter: indent comments correctlyPeter Hartmann2009-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | before, there was no newline between a comment and a start element. Now, there is and the comment is correctly indented. Task: 256468 Reviewed-by: Frans Englich
| * | More culling of Panther Code.Norwegian Rock Cat2009-06-232-45/+21
| | | | | | | | | | | | | | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-233-35/+33
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | * Add an error message for building architecture mismatchNorwegian Rock Cat2009-06-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snow Leopard defaults to 64-bit if you don't specify an architecture, whereas in the past it defaulted to 32-bit. This isn't a problem for Qt per-se. It *is* a problem if you just build an application that uses Qt but isn't using qmake stuff. To help in those situations, we should error out to let the person know that they need to change their configuration (in any case, the headers are going to complain and they get a much more cryptic message). Reviewed by: Morten Sørvig
| | * Regression against 4.4 in QRectF::operator|.Bjørn Erik Nilsen2009-06-232-35/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.4 QRectF handled flat rectangles in the same fashion as QRect does, but that changed with Lars' and Jo's optmizations done in the falcon branch. The difference is that the optimized version only checks whether the width or height is 0, whereas in 4.4 both had to be 0 (isNull()) before we bailed out. This regression also introduced a regression in QGraphicsItem::childrenBoundingRect(). Auto-test included. Task-number: 254995 Reviewed-by: Lars
| * | doc: Fixed typos.Martin Smith2009-06-231-2/+2
| | | | | | | | | | | | Task-number: 256711
| * | Remove default error stateEskil Abrahamsen Blomfeldt2009-06-233-65/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | Having an implicit default error state in the graph which the user has not added is unintuitive and ugly. Rather than have a default error state, we stop execution of the machine and print an error message when the machine has run-time errors. If a user wishes to prevent errors from stopping the machine, you can set one or more error states explicitly.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-233-8/+27
|\ \ \ | |/ /
| * | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+12
| | | | | | | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
| * | perform normalization of signatures for signal transitionsKent Hansen2009-06-222-8/+15
| | | | | | | | | | | | Make state->addTransition(foo, SIGNAL( bar( ) ), ...) work.
* | | Multitouch, Cocoa: Added Qt::WA_TouchPadAcceptSingleTouchEventsRichard Moe Gustavsen2009-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | By default this is set to false, meaning you will only get multitouch events. The reason why this is important is that we use the first touch of a new touch sequence to find out which widget to send the subsequent touches to. And on a touchpad, you normally want this to be the widget under the cursor when more than one finger is pressed on the pad.
* | | Remove QEvent::RawTouch from the documentationBradley T. Hughes2009-06-221-1/+0
| | | | | | | | | | | | This was removed long ago.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-2215-66/+57
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicsscene.cpp
| * | Changed enum Qt::Uninitialized to enum Qt::InitializationMartin Smith2009-06-195-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enum Qt::Uninitialized contains one value, which is also called Uninitialized. Because the type and the value used the same name, wherever the type Qt::Uninitialized was used in a function signature, you had to include the enum keyword. But qdoc's preprocessor doesn't like that, so you have to take the enum keyword out of the signatures. But then the compiler complains because the type and the value look the same. So I had to change the enum type name to Initialization, so the compiler can distinguish it from the value name. And qdoc likes that too.
| * | Small speedup of construction of uninitialized QByteArrayshjk2009-06-198-36/+18
| | | | | | | | | | | | | | | | | | | | | Directly construct uninitialized QByteArrays of required size instead of default-constructing one and resizing it afterwards. Reviewed-by: mariusSO
| * | New constructor QByteArray::QByteArray(int size, enum Qt::Uninitialized)hjk2009-06-192-1/+17
| | | | | | | | | | | | | | | | | | | | | Contrary to the QByteArray::QByteArray(int size, enum Qt::Uninitialized) constructor this does not initialize its data. Reviewed-by: mariusSO
| * | Don't initialize data that will be overwritten immediately.hjk2009-06-184-20/+10
| | | | | | | | | | | | Reviewed-by: mariusSO
| * | Use enum Qt::Uninitialized instead of struct QString::Uninitializedhjk2009-06-183-4/+3
| | | | | | | | | | | | | | | | | | | | | There is no BC issue as the changed constructor was introduced recently and there is no released version of Qt using it. Reviewed-by: mariusSO
| * | Make construction of unitialized QTransform/QMatrix a no-op.Bjørn Erik Nilsen2009-06-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These constructors are useful when you have to create a temporary uninitialized QTransform/QMatrix and later initialize it to something else. Done with Lars. Reviewed-by: samuel
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGeir Vattekar2009-06-182-0/+70
| |\ \
| * | | Doc: Removed mention of QItemAnimation from animation docs and setGeir Vattekar2009-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | QPropertyAnimation as a main class. Reviewed-by: Trust Me
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-183-2/+72
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * | | doc: Added explanation of QStringBuilder in QStringMartin Smith2009-06-182-0/+70
| |/ / | | | | | | | | | | | | | | | | | | | | | The QStringBuilder class documentation is marked \internal. A section has been added to the documentation for QString that explains how to use the reimplemented '%' operator of QStringBuilder to obtain more efficient string concatenation operations.