summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove QMatrix4x4& return values in response to API review feedbackRhys Weatherley2009-11-043-80/+65
| | | | Reviewed-by: Sarah Smith
* Incorporate API review feedback for math3d classes.Rhys Weatherley2009-11-0411-285/+197
| | | | Reviewed-by: Sarah Smith
* Fixed QPainterPath::addRoundedRect() for paths with Qt::WindingFill.Kim Motoyoshi Kalland2009-11-031-10/+10
| | | | | | | | | | | QPainterPath::addRoundRect()/addRoundedRect() added the path in counter-clockwise order, while other methods added paths in clockwise order. For Qt::OddEvenFill, the order doesn't matter, but it matters for Qt::WindingFill. Fixed by adding rounded rects in clockwise order like the other shapes. Task-number: QTBUG-1537 Reviewed-by: Trond
* Merge branch 'statemachine-api-changes' into 4.6Eskil Abrahamsen Blomfeldt2009-11-0319-151/+171
|\ | | | | | | | | | | Conflicts: doc/src/frameworks-technologies/statemachine.qdoc src/corelib/statemachine/qstatemachine.cpp
| * Rename QState::polished() signal to "propertiesAssigned"Eskil Abrahamsen Blomfeldt2009-11-039-40/+47
| | | | | | | | | | | | | | | | | | "Polished" was never a very descriptive word, and it already has a meaning attached in the QStyle API. Additionally, "propertiesAssigned" has the benefit of giving the relation to the assignProperty() function as part of the name. Reviewed-by: Kent Hansen
| * Change name of QMouseEventTransition::path() to hitTestPath().Eskil Abrahamsen Blomfeldt2009-11-034-14/+14
| | | | | | | | | | | | Make it clearer what the property actually does. Reviewed-by: Kent Hansen
| * Change name of modifiersMask property to "modifierMask"Eskil Abrahamsen Blomfeldt2009-11-038-49/+49
| | | | | | | | | | | | "modifierMask" is more correct English. Reviewed-by: Kent Hansen
| * Remove return type of QState::addTransition(QAbstractTransition*)Eskil Abrahamsen Blomfeldt2009-11-033-23/+36
| | | | | | | | | | | | | | | | | | Returning the input argument in a function can lead to confusion and serves no purpose here. Instead, we'll mirror the API from QMenu::addAction() overloads, where the overload that takes a preconstructed object has a void return type. Reviewed-by: Kent Hansen
| * Change name of DoNotRestoreProperties enum to DontRestorePropertiesEskil Abrahamsen Blomfeldt2009-11-033-9/+9
| | | | | | | | | | | | | | Using the abbreviated "Dont" is consistent with other negated enum names in Qt. Reviewed-by: Kent Hansen
| * Change name of QStateMachine::animationsEnabled property to "animated"Eskil Abrahamsen Blomfeldt2009-11-034-16/+16
| | | | | | | | | | | | | | The name "animated" is consistent with naming in Qt otherwise, as in QTreeView::animated and QMainWindow::animated. Reviewed-by: Kent Hansen
* | Fixed fillRect on QImage::Format_ARGB32 images.Kim Motoyoshi Kalland2009-11-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | With composition mode set to QPainter::CompositionMode_Source, the raster paint engine's fillRect function filled images which had non-premultiplied format with premultiplied colours. This was fixed by converting the premultiplied colour back to non-premultiplied before writing to the image. Task-number: QTBUG-5189 Reviewed-by: Trond
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-035-40/+16
|\ \
| * | Fixed some compiler warnings.Samuel Rødal2009-11-033-35/+7
| | | | | | | | | | | | Reviewed-by: Trond
| * | Made QPainter::drawText() respect Qt::TextDontClip flag.Samuel Rødal2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The flag was not respected in the vertical direction for any text lines completely outside the bounding rect. Task-number: QTBUG-1666 Reviewed-by: Trond
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-0326-157/+687
| |\ \
| * | | Fixed crash in QPixmap::fromImage with an Indexed8 without a colortable.Gunnar Sletta2009-11-031-4/+8
| | | | | | | | | | | | | | | | Reviewed-by: Trond
* | | | Check for QPixmap::isNull() in QPainter::drawPixmap()Gunnar Sletta2009-11-031-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
* | | | Compile...Gunnar Sletta2009-11-031-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-03366-32090/+11669
|\ \ \ \
| * | | | fix font height calculation on QWSJoerg Bornemann2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fontDef.pixelSize is a qreal now and we should round it after multiplication to avoid an accuracy loss. Reviewed-by: mae
| * | | | WebKit compile fix for Windows CEJoerg Bornemann2009-11-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure if this is right fix. We could also disable PLUGIN_PACKAGE_SIMPLE_HASH. But this is automatically enabled when NETSCAPE_PLUGIN_API is disabled. Reviewed-by: thartman
| * | | | document the -no-ltcg default for Windows CE in changes-4.6.0Joerg Bornemann2009-11-031-0/+3
| | | | |
| * | | | disable link time code generation by default on Windows CEJoerg Bornemann2009-11-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be consistent with desktop Windows Qt, we also disable LTCG by default. To turn it on, use the -ltcg configure switch. Reviewed-by: mauricek
| * | | | qdoc: Disabled reporting the NOTIFY signal until I know what it broke.Martin Smith2009-11-031-1/+0
| | | | | | | | | | | | | | | | | | | | Task-number: 259071
| * | | | Fixed compilation on windows.Dmytro Poplavskiy2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | | Fixed qrand global static related problem.Dmytro Poplavskiy2009-11-031-19/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qrand() uses global static seed storage, but if used from destructors of other global static objects (directly or via ~QSettings() or QMap::insert()) the global static seed storage can be already deleted. Fallback to plain rand() in this case. Task-number: QTBUG-5218 Reviewed-by: Justin McPherson
| * | | | Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6Thiago Macieira2009-11-0243-325/+1672
| |\ \ \ \
| | * \ \ \ Merge remote branch 'origin/4.6' into core-4.6Thiago Macieira2009-10-2921-131/+991
| | |\ \ \ \
| | * | | | | Autotest: this test is failing, enable debugging to find out why.Thiago Macieira2009-10-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't happen on my machine, so I need to figure out what's different. Reviewed-by: Trust Me
| | * | | | | Remove the posix_memalign and Win32 _aligned_mallocThiago Macieira2009-10-291-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MinGW doesn't have _aligned_malloc and posix_memalign doesn't have a realloc function. So use our own implementation in all platforms. Removing posix_memalign was reviewed by Brad, but I apparently lost the commit. Reviewed-by: Trust Me
| | * | | | | Merge branch '4.6' into core-4.6Thiago Macieira2009-10-2931-467/+861
| | |\ \ \ \ \
| | * | | | | | Fix compilation on Mac: there's no malloc.h thereThiago Macieira2009-10-291-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | Update confusing qWarning message.Thiago Macieira2009-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | * | | | | | Fix compilation in QContiguousCache.Thiago Macieira2009-10-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | | | QLocalServer: block indefinitely when timeout value is -1Peter Hartmann2009-10-282-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as described in the documentation. Furthermore: * use qt_safe_select to timeout correctly * return immediately when timeout value is 0 Reviewed-by: Oswald Buddenhagen
| | * | | | | | Initialise the reserved bits to 0.Thiago Macieira2009-10-287-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is future compatibility: we must rely on them being 0 in older versions of Qt. Reviewed-by: Bradley T. Hughes
| | * | | | | | Fix Qt containers to properly support types with strict alignments.Thiago Macieira2009-10-2810-39/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QContiguousCache is a new type, so there are no binary compatibility issues. QHash and QMap didn't have any public qMalloc / qFree, so the entire logic is contained in .cpp code. However, since old code will not inform us of the alignment requirements, we need to add a bit to the structure to indicate whether strict alignment is in use or not. QList doesn't require any changes. For small, movable types, they're all stored in the pointer array itself, so they're aligned. For larger types, we use new(), so types with stricter requirements should define their own operator new(). QLinkedList cannot be fixed. It uses new() on the QLinkedListNode, which contains a T type. Sorry. QVector did have public qMalloc / qFree. I've moved the calls to the inner function and made it keep the old calls if the alignment requirement is below a certain threshold. The idea is that, if it's above, no one was using QVector anyway. Reviewed-by: Bradley T. Hughes
| | * | | | | | Add the aligned versions of qMalloc/qRealloc/qFreeThiago Macieira2009-10-282-0/+103
| | | | | | | |
| | * | | | | | Add some STL compatibility for QContiguousCache and private inheritanceThiago Macieira2009-10-281-60/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The private inheritance ensures that we don't try to access the types under the wrong pointer. If we did that, we'd cause strict aliasing violations. Reviewed-by: Olivier Goffart
| | * | | | | | Doc: add documentation for QDBusServiceWatcher class.Thiago Macieira2009-10-281-0/+163
| | | | | | | |
| | * | | | | | Autotest: add unit test for QDBusServiceWatcherThiago Macieira2009-10-282-0/+281
| | | | | | | |
| | * | | | | | Add QDBusServiceWatcher class.Thiago Macieira2009-10-283-69/+393
| | | | | | | |
| | * | | | | | Add a warning to user's connecting to serviceOwnerChanged directlyThiago Macieira2009-10-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want people to not use this signal directly.
| | * | | | | | Stop using the NameOwnerChanged signal without arg0 in QtDBus itselfThiago Macieira2009-10-283-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using this signal to update the signal hooks when the remote service changed. That meant each Qt app received every single service creation, change or destruction. Now we only watch the services we're really interested in.
| | * | | | | | Move the bulk of the signal connecting/disconnecting code to ↵Thiago Macieira2009-10-283-60/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDBusConnectionPrivate I'll need to recurse into the signal connection mechanism in the next commit.
| | * | | | | | Fix the use of the owner when connecting the service "watcher".Thiago Macieira2009-10-282-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use null services to indicate we're not interested in the owner, but empty-but-not-null to indicate we don't know what the owner is. Since empty service names are not valid, this will mean that this rule won't match.
| | * | | | | | Use the new argument-based rule-matching in QDBusAbstractInterface.Thiago Macieira2009-10-281-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to listen only to the activations we're really interested in.
| | * | | | | | Autotest: add a test that tries to follow a service changing owners.Thiago Macieira2009-10-281-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure if this used to work before...
| | * | | | | | Autotest: fix improper use of the serviceOwnerChanged signalThiago Macieira2009-10-281-23/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was doubly wrong: it first registered a service name, then it connected to signal to watch it. You can't receive a signal if you connect to it after it's emitted... Second, it waited for any serviceOwnerChanged() signal to exit the event loop, not necessarily the one we wanted to receive. This used to work because we'd always connect to the D-Bus signal, but now we don't anymore.
| | * | | | | | Add new public API to QDBusConnection for connecting with stringThiago Macieira2009-10-282-22/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matching. The bus allows us to match string arguments when receiving messages. This is very useful for the NameOwnerChanged signal, whose first argument is usually what we're interested in. By using these new functions, you can restrict receiving of signals to those that you truly want, instead of receiving NameOwnerChanged for all services registered/unregistered on the bus.