summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QGAL: clean up interpolation codeCaio Marcelo de Oliveira Filho2009-11-122-95/+16
| | | | | | | | | Now the interpolation doesn't need to know how to traverse complex anchors, since when it runs, the graph is not simplified anymore. This commit removes unnecessary code for dealing with that. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
* QGAL: remove the caching of simplified graphCaio Marcelo de Oliveira Filho2009-11-123-72/+22
| | | | | | | | | | | | | | | | | | | After discussion with Jan-Arve, we decided to remove for good the caching of simplified graph. This avoided recalculating the simplification (but not the simplex) in some situations. Since vertex simplification, this was temporarily disabled already. To know whether if we could the cached version or not, we needed to track individual anchors to see whether they reached size 0 or they were 0 and changed the size. This is because the vertex simplification depend on that fact. Now the simplified version of the graph exists only during the execution of calculateGraphs() function. This and next commits clear up the code to take advantage of that fact. Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
* QGAL: fix update size hints logic in parallel anchorsCaio Marcelo de Oliveira Filho2009-11-121-6/+13
| | | | | | | | | | | | | | | | | When filling sizeAt* values for parallel anchors, we have to identify the case when the second anchor in the parallel doesn't have the same direction as the parallel itself. However, relying on the parallel group vertices to identify this case is not safe, because after a parallel group a new vertex simplification can happen. So, the comparing the 'from' with the first edge is the correct way to verify whether the second is backwards. Code was fixed to follow that. Note that, without negative spacing the case "out-of-order" for parallels is only the trivial case (size == 0). Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
* QGAL: Update code documentationEduardo M. Fleury2009-11-121-13/+26
| | | | | Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
* QGAL: Move size information from AnchorData to QGraphicsAnchorPrivateEduardo M. Fleury2009-11-123-108/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To solve the spacing persistency bug, this commit saves the preferredSize (spacing) information inside QGraphicsAnchorPrivate. The problem started when we could not rely on "AnchorData->prefSize" to keep the spacing information for user-defined anchors. This happens because that member can be overriden if the spacing is negative (anchor is inverted) or its sizePolicy is of type "Ignored" (it is overriden by minSize). Then, to decide where to store it, we aimed to make something similar to what happens with item-internal anchors. Those can rely on their items to get fresh information regarding their size, so we decided that user-anchors (that don't have items, but do have QGraphicsAnchors) could read such information from there. This refactory also reduced the deep indirection that existed in the "QGraphicsAnchor->setSpacing" call. Previously it would call internal layout methods to do some black magic, that's now gone. As the spacing information is now stored in the anchor itself, it can do pretty much all the work and, after that, just invalidate the layout. Also, moved information like "AnchorData->hasSize" to QGAnchor as its pretty much related to the preferredSize information itself. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
* QGAL: Update header documentation in QGALPrivateEduardo M. Fleury2009-11-121-9/+14
| | | | | | | | | | | | | | | | | | As part of the refactoring of the setSpacing logic, we are encoraging the analogy between the references to QGraphicsLayoutItem and to QGraphicsAnchor, from the AnchorData point of view. It happens that leaf anchors (ie, those that were not created by the simplification) either represent an item or an user-created anchor. This means that they should fetch their size information either from a QGraphicsLayoutItem (member AnchorData->item) or from a QGraphicsAnchor (member AnchorData->graphicsAnchor). Thus, I'm organizing the header to make it more consistent to the new concept. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
* QGAL (Test): Add test to ensure persistency of user-defined spacingEduardo M. Fleury2009-11-121-0/+26
| | | | | | | | | Currently the user-defined spacing is saved inside "AnchorData->prefSize". However this value may be modified if spacing is negative or if the anchor's policy is "QSizePolicy::Ignored". Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
* QGAL (Test): Fix order of parameters in QCOMPAREEduardo M. Fleury2009-11-121-2/+2
| | | | | | | | | The order is relevant when the test fails and QTest prints the failure message refering to the values as the expected and actual ones. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
* Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-121-0/+42
| | | | Reviewed-by: TrustMe
* Phonon; Integrate changes to cmake files.Justin McPherson2009-11-124-20/+38
| | | | Reviewed-by: TrustMe
* Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-121-2/+10
| | | | | | | | | | | | | id. This fix is similar to KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
* Gstreamer: Added DVD supportJustin McPherson2009-11-121-15/+19
| | | | | | | | | Intergrated KDE change 1040729 by nlecureuil This bug was already fixed in Qt phonon repo in exactly the same way, but KDE change is applyed to keep phonon sources in sync. Reviewed-by: Dmytro Poplavskiy
* Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-121-4/+7
| | | | | | | | Integrated KDE change 1027568 by cguthrie. This commit fixes a bug that was highlighted when devices had been added/removed or the backend was reloaded. The AudioDevice used to use a static counter to allocate itself a device id that was propigated through the Phonon API. Code in the Backend invalidly assumed that the index in the list was the same as this id.
* gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-122-1/+7
| | | | | | | | Integrated KDE change 1027567 by cguthrie. Glib issues a warning if this is called more than once so we ensure that's what we do. Reviewed-by: Dmytro Poplavskiy
* Gstreamer: Detect more mimetypesJustin McPherson2009-11-121-2/+9
| | | | | | Integrated KDE change 1029491 by nlecureuil Reviewed-by: Dmytro Poplavskiy
* reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-121-3/+15
| | | | | | | | drive noise Integrated KDE changes 1029492, 1030905 by nlecureuil Reviewed-by: Dmytro Poplavskiy
* gstreamer: Do not call gst_deinit() but do free the device and effect ↵Justin McPherson2009-11-121-1/+0
| | | | | | | | | | | | | manager objects on backend destruction. Integrated KDE change 1027566 by cguthrie. Normally the backend is only destroyed once when the app exists, but calling gst_deinit() means that the whole gstreamer system becomes unrecoverable. This means that if you switch backends away from gstreamer and then back again it will not work. Gstreamer devs recommend that you do not call gst_deinit() at all except in test cases. Reviewed-by: Dmytro Poplavskiy
* Remove rogue \refs from documentation.Justin McPherson2009-11-122-2/+2
| | | | Reviewed-By: TrustMe
* Import change 924855 from phonon-svn.Justin McPherson2009-11-121-2/+6
| | | | | | | | r924855 | mkretz | 2009-02-12 05:49:12 +1000 (Thu, 12 Feb 2009) | 1 line forwardport: two more adaptor accesses where adaptor might be 0 Reviewed-by: Justin McPherson
* Import change 932546 from phonon-svn.Justin McPherson2009-11-1291-91/+91
| | | | | | | | r932546 | thiago | 2009-02-27 07:33:54 +1000 (Fri, 27 Feb 2009) | 1 line Update copyrights: Trolltech ASA -> Nokia Corporation Reviewed-by: Justin McPherson
* Import change 950964 from phonon-svn.Justin McPherson2009-11-121-2/+2
| | | | | | | | r950964 | dfaure | 2009-04-08 19:26:40 +1000 (Wed, 08 Apr 2009) | 2 lines fix compilation with -DQT_STRICT_ITERATORS Reviewed-by: Justin McPherson
* Import change 953828 from phonon-svnJustin McPherson2009-11-121-1/+1
| | | | | | | | | r953828 | tkrotoff | 2009-04-15 01:25:00 +1000 (Wed, 15 Apr 2009) | 1 line Fix qmath.h include: should be written <QtCore/qmath.h> instead of <qmath.h> in order to be consistent with the rest of the code that use <QtCore/...> Reviewed-by: Justin McPherson
* Doc: fix typoVolker Hilsheimer2009-11-111-1/+1
| | | | Fixes: QTBUG-5167
* Doc: Link to the public bug tracker.Volker Hilsheimer2009-11-112-11/+24
|
* Changes file updatedaavit2009-11-111-0/+2
|
* doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-112-3/+10
|
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Benjamin Poulain2009-11-1143-20848/+21472
|\
| * Fixing warnings in QScopedPointer test caseJoão Abecasis2009-11-111-1/+2
| |
| * qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | | | | | | | | | | | | | | | ...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
| * qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | | | | | | | In the Method Documentation and Signal Documentation sections.
| * qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| | | | | | | | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
| * Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| * Switch on DEF filesShane Kearns2009-11-111-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEF files containing the frozen DLL exports are in use for Symbian OS builds, except developer builds (configured with -developer-build) The reason for this exception is that developer builds export additional private interfaces to allow autotests to inject or monitor the internal data of a class. These autotest exports are not part of the API or the binary interface, so they are excluded from DEF files. Task-number: QTBUG-4436 Reviewed-by: Jason Barron
| * Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| * Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-116-9/+56
| |\
| | * Pinchzoom example zooms more smoothDenis Dzyubenko2009-11-112-5/+18
| | | | | | | | | | | | | | | | | | | | | Remember the scale factor so it won't reset each time a new touch sequence starts. Reviewed-by: Bradley T. Hughes
| | * Fixed opening files in the findfile example.Denis Dzyubenko2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | QDesktopServices::openUrl expects a proper url, not just a filename. Reviewed-by: Jedrzej Nowacki
| | * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1016-217/+805
| | |\
| | * \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-104-59/+163
| | |\ \
| | * \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-101-0/+33
| | |\ \ \
| | * \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1054-265/+1161
| | |\ \ \ \
| | * \ \ \ \ Merge remote branch 'origin/4.6' into 4.6-platformDenis Dzyubenko2009-11-09125-1381/+1758
| | |\ \ \ \ \
| | * | | | | | Modified windowflags manualtestDenis Dzyubenko2009-11-092-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a few buttons to maximize a window from the code. Reviewed-by: trustme
| | * | | | | | 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 commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-11280-2839/+5756
| |\ \ \ \ \ \ \
| * | | | | | | | fix tst_qdatastream for Windows CEJoerg Bornemann2009-11-102-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SRCDIR is empty on Windows CE, so it doesn't make sense to prepend a slash. No other autotest does this. Also, we must deploy test2.svg. Reviewed-by: thartman
| * | | | | | | | make qfunctions_wince.h C compatible againJoerg Bornemann2009-11-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mauricek
| * | | | | | | | fix WebKit build on Windows CE 6Joerg Bornemann2009-11-096-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Again, we have fun with the C time functions on Windows CE. On Windows CE 5: the functions are declared but not defined. On Windows CE 6: the functions are neither declared nor defined. Reviewed-by: Simon Hausmann
| * | | | | | | | tst_largefile.cpp Windows CE compile fixJoerg Bornemann2009-11-092-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
| * | | | | | | | compile fix for tst_qfile on Windows CEJoerg Bornemann2009-11-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signature of QT_OPEN to be the same on all platforms. Reviewed-by: thartman