summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile fixes related to QScopedPointer.Jason Barron2009-08-033-4/+5
| | | | | Just a few small fixes to get things compiling with the QScopedPointer changes.
* Merge commit 'qt/master-stable'Jason Barron2009-07-30121-847/+1943
|\ | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * fix compilation without 3d supportLars Knoll2009-07-291-1/+1
| |
| * Ensure hover enter events are dispatched on mouse press.Andreas Aardal Hanssen2009-07-292-0/+76
| | | | | | | | | | | | | | | | | | | | This change ensures that mouse presses received by the scene when there are no current mouse grabbers trigger hover event delivery. This is useful when the scene only receives presses, and no mouse moves (e.g., disabling mouse tracking on the viewport, or on systems where the mouse press is the first received event). Reviewed-by: Michael Brasser
| * Fix remaining autotest failures in tst_QGraphicsWidgetAndreas Aardal Hanssen2009-07-292-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change f68fed3 introduced a few regressions in the QGraphicsWidget autotests. It turned out those autotests relied on behavior that this fix "fixed". The exact bugs were 1) that setting focus on a window or a child of a window that isn't active will automatically give that item focus, despite that its window is inactive (in contrast it should just set up subfocus and give the item focus when the window is activated), and 2) that adding a window to a scene that is active did not immediately activate that window. So one fix in the test and one in QGraphicsScene. The autotests were modified so that the respective tests operate on an active scene (by assigning the scene to an active view). The change in QGraphicsScene ensures that the first window that gets added to an active scene that does not have any active windows already, automatically gets activated. Reviewed-by: Michael Brasser
| * Disambiguate QGraphicsObject::children().Andreas Aardal Hanssen2009-07-291-0/+7
| | | | | | | | | | | | | | Add using to prefer QObject::children() over the obsolete QGraphicsItem::children() function. Reviewed-by: Henrik Hartz
| * Fixes various db2 autotest issues.Bill King2009-07-293-5/+11
| |
| * forgot to add this file in the last commit.Lars Knoll2009-07-291-0/+73
| |
| * Implement new transformation handling for graphics items.Lars Knoll2009-07-2914-455/+998
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea of having separate rotationX/Y/Z, shearX/Y, etc. methods in QGraphicsItem turned out to be not giving us the flexibility we need and wanted. The new code now implements a different scheme, where we keep simple rotate (around z-axis), scale and transformOriginPoint methods, but remove the other ones. Instead we now have an additional list of QGraphicsTransform object. QGraphicsTransform is an abstract class that inherits QObject. Several specializations are provided and can be used to transform (and through property bindings animate) the item. Reviewed-By: Andreas
| * Added a QVariant testlib toString specialization.Rohan McGovern2009-07-283-2/+89
| | | | | | | | | | | | | | | | If comparing two variants fails, the failure message will now output the type and value of the variants (rather than "Compared values are not the same"). Reviewed-by: Thiago
| * Doc: Some final QMatrix cleanups.Volker Hilsheimer2009-07-284-15/+27
| |
| * Doc: Re-apply relevant change from 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2Volker Hilsheimer2009-07-281-4/+11
| | | | | | | | | | Clarified that the format used in QImage::fromData() is the image format, not the pixel format.
| * Remove a warning in qdirectfbpaintengineAnders Bakken2009-07-281-3/+1
| | | | | | | | | | | | These structures are only used in versions after 0.922. Reviewed-by: Donald <qt-info@nokia.com>
| * Implement a copy constructor for QXmlParseException to avoid crashes whenVolker Hilsheimer2009-07-283-0/+45
| | | | | | | | | | | | | | | | | | throwing them. Autotest included. Task: 258081 Reviewed-by: Trustme
| * Doc: Document the purpose of the QTextFormat etc enums, and add a few linksVolker Hilsheimer2009-07-281-29/+72
| | | | | | | | to respective APIs.
| * Doc: typo.Volker Hilsheimer2009-07-281-1/+1
| |
| * Doc: Cleaning up.Volker Hilsheimer2009-07-281-12/+15
| | | | | | | | This closes task 235801.
| * Fixed incorrect QGLFramebufferObject documentation.Samuel Rødal2009-07-281-1/+4
| | | | | | | | Reviewed-by: Gunnar Sletta
| * Move sub-attaq from examples to demos because sub-attaq is a bitAlexis Menard2009-07-2877-20/+100
| | | | | | | | too "advanced".
| * Implement a new pointer-tracking mechanism for QSharedPointer.Thiago Macieira2009-07-282-41/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers don't obey the same rules of "top-of-object" values for casting a pointer from a given class to void *. In any case, that can only work for polymorphic types (with a virtual table). So don't track the pointers by their pointer value, but instead by the d-pointer of the QSharedPointer object. The same cases that were caught before should still be caught. We still won't catch the creating a second QSharedPointer for the same object if the pointer values are different, though (when cast to void*). Reviewed-by: Bradley T. Hughes
| * Fix startDetached: the pipes must be CLOEXEC for them to work.Thiago Macieira2009-07-281-2/+2
| | | | | | | | | | | | | | | | | | In de05f9a40e41deb79daf5c4935b2645d70d7f322 I removed the fcntl that set FD_CLOEXEC because it was supposed to be set by qt_safe_pipe. Turns out that this code didn't call the wrapper function... Reviewed-by: ossi
| * Work around weird issue with Sun CC 5.9: Self was the wrong class.Thiago Macieira2009-07-281-2/+2
| | | | | | | | | | | | I don't know if this was only the debugging symbols or if the compiler was really wrong. But while debugging, Self was ExternalRefCountWithCustomDeleter, which is wrong at this point.
| * Disable the forwardDeclared1 test with SunCC: it doesn't workThiago Macieira2009-07-281-0/+4
| | | | | | | | | | | | | | | | | | I added this test because I thought that the compiler would find the forward-declarations due to the "one definition" rule. In hindsight, it's not a good idea. Sun CC warns about this, gcc doesn't. With Sun CC, the code leaks, with gcc it doesn't.
| * Sun CC 5.9 does not support template friendsThiago Macieira2009-07-281-0/+3
| | | | | | | | But I'm told 5.10 does.
| * Fixes doc typos and indentation in abstractitemview & itemselectionmodelLeonardo Sobral Cunha2009-07-282-238/+236
| | | | | | | | Reviewed-by: Trustme
| * qdoc: Added superscript obsolete to obsolete links.Martin Smith2009-07-282-2/+12
| | | | | | | | Only for obsolete links from non-obsolete things.
| * Assistant/helpconverter: Remove hard-coded version check in ADP file.ck2009-07-282-9/+17
| | | | | | | | | | | | | | | | The AdpReader checked for a version attribute == 3.2.0. This has been replaced by a check for >= 3.2.0 Task-number: 258551 Reviewed-by: kh
| * Fix webkit import from the trunkSimon Hausmann2009-07-281-2/+14
| | | | | | | | | | | | | | Exclude more files from the import that are not needed for the Qt build, and include jsc for qtscript debugging. Reviewed-by: Trust me
| * Fix menubar item size incorrect with iconJens Bache-Wiig2009-07-281-4/+3
| | | | | | | | | | | | | | | | | | When you have an icon set we do not show the text label, but the previous code would still use the text for the size hint calculation. Task-number: 218836 Reviewed-by: ogoffart
* | Fix compilation of QTestLib on Symbian.Jason Barron2009-07-291-2/+2
| | | | | | | | Open C doesn't support signals so #ifdef this code out.
* | Merge commit 'qt/master-stable'Jason Barron2009-07-2971-2880/+639
|\ \ | |/
| * Remove tank game exampleEskil Abrahamsen Blomfeldt2009-07-2829-2514/+1
| | | | | | | | | | | | | | | | | | After discussions with product management, it was considered best that this example be removed until it can be improved. There are some bugs an irregularities that should be cleaned up, and the theme should be made less violent. Reviewed-by: Volker Hilsheimer
| * Disable Texture-From-Pixmap on everything other than LinuxTom Cooksey2009-07-281-1/+6
| |
| * Fixes: Compile on winscwHenrik Hartz2009-07-281-1/+2
| | | | | | | | | | | | RevBy: Frans Englich Details: QHash::value creates an internal compiler error in this case on Metrowerks, using find instead
| * Doc: Focus and key-event handling in QGraphicsItem.Volker Hilsheimer2009-07-272-28/+37
| |
| * Assistant: Removed redundancy in index reader classes.ck2009-07-278-210/+296
| | | | | | | | | | | | | | Moved common parts of QHelpSearchIndexReader{Default,Clucene} into a new common base class QHelpSearchIndexReader. Reviewed-by: kh
| * Fix build on SolarisTom Cooksey2009-07-271-2/+5
| | | | | | | | | | Solaris seems to define glXReleaseTexImageEXT rather than let it be resolved as a function pointer.
| * Don't animate widgets on first show in VistaJens Bache-Wiig2009-07-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | Checkboxes would animate when first shown if they were checked. This is unintentional and looks a bit odd in wizard for instance. To fix this we simply check if the old state was set. Note that this is safe because we will at least require the enabled state flag to be set. Task-number:253075 Reviewed-by: ogoffart
| * Make typeToName testcase pass, and add basic test for Math3D classes.Volker Hilsheimer2009-07-271-2/+84
| | | | | | | | Reviewed-by: Trustme
| * Work around a Sun CC 5.9 compiler bug: the threadEngine variable isn't found.Thiago Macieira2009-07-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtConcurrent had the following code: template <typename T> class ThreadEngineStarterBase { ... protected: ThreadEngine<T> *threadEngine; }; template <typename T> class ThreadEngineStarter : public ThreadEngineStarterBase<T> { public: ThreadEngineStarter(ThreadEngine<T> *threadEngine) :ThreadEngineStarterBase<T>(threadEngine) {} [...] }; The Sun CC compiler simply didn't parse the parameter declaration in the constructor. Instead of complaining, it silently ignored the problem. Which meant that the constructor simply used the uninitialised member variable from the base class to call the parent constructor, which ended up initialised with itself. You'd think that it's just because the parameter has the same name as a member variable. But it appears to be a compiler bug altogether. If you change the name, then you start getting compile errors. This change is a workaround that worked. Reviewed-By: Bradley T. Hughes
| * Make the STL test a little more strict, using constructs used by Concurrent.Thiago Macieira2009-07-271-10/+51
| | | | | | | | | | | | | | | | | | | | At least the RogueWave STL found in Sun Studio 12 (latest version available) isn't standards-compliant enough for QtConcurrent's needs. Note that WebKit also requires STL support, so this means QtWebKit will not compile with RW STL on Solaris. Reviewed-By: Bradley T. Hughes
| * Sun CC 5.9 still doesn't support Template-Template ParametersThiago Macieira2009-07-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | I had added the version check when we only had CC 5.5 and 5.6, expecting that 5.7 would have the support. And if it didn't, then someone would notice the compile error in QtConcurrent, bumping the version number here. Except that QtConcurrent was never enabled with Sun CC. Which meant that we never got to test TTP support. Reviewed-By: Bradley T. Hughes
| * Fix warning with Sun CC 5.9 and xlC 7: no new types inside anonymous unions.Thiago Macieira2009-07-271-5/+6
| | | | | | | | | | | | | | See ba191b0a26b966ad1fb596a905307399922bc44a for a similar commit done to QStringMatcher. Reviewed-By: Bradley T. Hughes
| * Doc: Remove reference to QMatrixVolker Hilsheimer2009-07-271-5/+3
| | | | | | | | | | As pointed out on IRC, setTransform is used most frequently in code and in an ideal world would be the only such function.
| * Doc: Document format for new Math3D classes as well as QTransformVolker Hilsheimer2009-07-271-0/+56
| |
| * "MAP" is a too common name to use it without #undef'ing it firstRobert Griebl2009-07-271-1/+3
| | | | | | | | Reviewed-by: TrustMe
| * Compile on Mac OS XBradley T. Hughes2009-07-271-1/+1
| |
| * Fix qmake.pro so it can build qmake.Jason Barron2009-07-271-0/+1
| | | | | | | | | | | | | | | | qmake now uses a few of the files from the 'codecs' directory so add that directory to the VPATH directory such that building qmake using this .pro file is possible. Reviewed-by: TrustMe
| * Doc: QPictureIO and QPictureFormatPlugin have been obsolete for a while.Volker Hilsheimer2009-07-271-1/+0
| |
| * Fix qmake dependency generation for include statements with local files.Simon Hausmann2009-07-271-8/+6
| | | | | | | | | | | | | | | | The header file should be looked up relative to the directory of the compilation unit and not qmake's current directory or the like. Simplified the logic slightly to achieve that. Reviewed-by: João Abecasis <joao@abecasis.name>