summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * Compile on Mac OS XBradley T. Hughes2009-07-272-4/+4
| | | | | | | | Need the right include for the mach_*() functions.
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMorten Sørvig2009-07-2717-177/+137
| |\
| | * Fixed SC_ComboBoxArrow returning inverted subControlRect on vistaJens Bache-Wiig2009-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arrow was reported to be on the wrong side of the control. Technically the arrow part seems to cover the whole rect on Vista and Gtk+ but due to compatibility it is probably safer to keep the old rects for now. Task-number: 252857 Reviewed-by: ogoffart
| | * Avoid floating point code when converting Mach time to timevalBradley T. Hughes2009-07-271-2/+2
| | | | | | | | | | | | | | | | | | Mac OS X only change Reviewed-by: Thiago
| | * Refactor monotonic time code to avoid duplication.Bradley T. Hughes2009-07-274-114/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the monotonic clock source detection in qeventdispatcher_unix.cpp with that in qcore_unix.cpp. As discussed with Thiago, we're also removing older compat code at the same time (spinning on select() when we think it woke up early). Reviewed-by: Thiago
| | * "enabled" parameter should default to true, as with QGraphicsView andVolker Hilsheimer2009-07-272-1/+3
| | | | | | | | | | | | | | | | | | QPainter. Reviewed-by: Simon Hausmann
| | * Doc: Obsolete QMatrix and QPainter APIs using it.Volker Hilsheimer2009-07-274-38/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | QTransform and respective APIs should be used. Still some changes required - Some references to QMatrix left in documentation - Qt code uses QMatrix APIs (ie translationX) Reviewed-by: Samuel
| | * Doc: QTextLayout is the class to use in interactive text controls.Volker Hilsheimer2009-07-271-1/+1
| | |
| | * Doc: QTextLayout is the class to use in interactive text controls.Volker Hilsheimer2009-07-272-12/+10
| | |
| | * QHttpNetworkConnectionPrivate: Removed wrong commentMarkus Goetz2009-07-271-6/+0
| | | | | | | | | | | | | | | | | | | | | The comment was speaking about upload progress, however the code is about download progress. Reviewed-by: TrustMe
| | * Doc: replace links to obsolete APIsVolker Hilsheimer2009-07-272-2/+2
| | |
| | * Doc - fixed a typo [describles->describes]Kavindra Devi Palaraja2009-07-271-2/+2
| | | | | | | | | | | | | | | | | | Task: 258573 Reviewed-By: TrustMe
| * | Make the Character Palette work on Mac/Cocoa.Morten Sørvig2009-07-272-4/+17
| |/ | | | | | | | | | | | | | | | | Handle the case when insertText is called with no corresponding keyDown. This fix is for the Cocoa port. Task-number: 147379
| * Mac/Cocoa: Remove separator line for "unified document tabs"Morten Sørvig2009-07-273-3/+19
| | | | | | | | | | | | | | | | Call [NSToolbar setShowsBaselineSeparator] on the (unified) toolbar if the window contains tabs in document mode. Task-number: 252660 Reviewed-by: Richard Moe Gustavsen
* | Merge commit 'qt/master-stable'Jason Barron2009-07-28295-168401/+3251
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * Really, really fix HPUX this timeTom Cooksey2009-07-271-1/+1
| | | | | | | | | | | | The conditionals were the wrong way round. Reviewed-By: Samuel
| * Add QGraphicsItem::ItemAutoDetectsFocusProxy and improve subfocus support.Andreas Aardal Hanssen2009-07-278-73/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you set this flag on an item, and descendant item that gains input focus will become this item's focus proxy. This simplifies how focus proxy items are assigned from QML; instead of binding the possible focusProxy property to a named child widget, this assignment happens automatically as you set the focus property of a descendant to true. As part of this change, QGraphicsWidget::focusWidget behavior has been improved and moved into QGraphicsItem. For example, if you set focus on an item that it's part of a scene, it can gain focus once the parent has been assigned (which is how object trees are built in QML). Autotests are included. Reviewed-by: Michael Brasser
| * Doc: Remove more links to obsolete functions.Volker Hilsheimer2009-07-252-5/+5
| |
| * Doc: Replace QMatrix with QTransform and respective functions in various places.Volker Hilsheimer2009-07-257-32/+33
| |
| * Doc: Document that coordinates are dropped.Volker Hilsheimer2009-07-252-4/+8
| |
| * Doc: Replace more links to obsolete APIs.Volker Hilsheimer2009-07-254-36/+18
| |
| * Doc: Replace links to obsolete APIs.Volker Hilsheimer2009-07-2515-40/+36
| |
| * Using QNetworkAccessManager, so need to pull in QtNetworkVolker Hilsheimer2009-07-252-0/+2
| |
| * Revert "Doc: Clarified that the format used in QImage::fromData() is the image"Volker Hilsheimer2009-07-251-31/+27
| | | | | | | | | | This reverts commit 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2, which accidentially reverted previous commits.
| * Doc: \em is not a qdoc command, \e is correctVolker Hilsheimer2009-07-251-2/+2
| |
| * Compile from repo checkoutVolker Hilsheimer2009-07-251-0/+2
| |
| * Build without Qt3SupportVolker Hilsheimer2009-07-251-1/+1
| |
| * No link-errors when building from repositoryVolker Hilsheimer2009-07-252-0/+6
| |
| * Fix compilation with older GCC versions: need a constructor.Thiago Macieira2009-07-251-0/+5
| | | | | | | | | | I don't know exactly why this is needed, but otherwise GCC complains that there is no default constructor.
| * Fix a running external tests: user program headers must come first.Thiago Macieira2009-07-251-2/+2
| | | | | | | | | | No wonder QT_SHAREDPOINTER_TRACK_POINTERS was having no effect: there was an #include <QtCore/QtCore> before it.