summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-233-16/+42
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-231-2/+11
| |\
| | * Diacritic input broken, duplicate the base glypha (on Mac OS X carbon)Prasanth Ullattil2010-04-231-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | This was a regression introduced by 8da880e77db04c. The saved key event needs to be cleared if we process a valid raw key event. Task-number: QTBUG-7099 Reviewed-by: Richard Moe Gustavsen
| * | qdoc: Removed nested <ul> elements from the TOCMartin Smith2010-04-231-13/+30
| |/ | | | | | | Moved the class="leveli" into the <li> elements.
| * Cocoa: quiting the app from the menubar may cause a crashRichard Moe Gustavsen2010-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | This happends if the app creates a menubar and assignes an action to quit, and the delete the menubar. Under some circumstances the action is not removed from the quit item, and a crash might occur. This patch clears the quit action from the menubar for this condition Reviewed-by: prasanth
* | Doc: Fixed typos.David Boddie2010-04-232-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Ensure that all qthelp URLs have paths that start with /qdoc/.David Boddie2010-04-232-6/+5
| | | | | | | | Reviewed-by: kh
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2252-209/+489
|\ \ | |/ | | | | | | Conflicts: tools/qdoc3/test/qdeclarative.qdocconf
| * qdoc: Updated the extra images variable again, for each manual.qdocconf.Martin Smith2010-04-225-10/+43
| | | | | | | | And this time I also did it for qdeclarative.qdocconf
| * Revert "Add new QDataStream version for Qt 4.8."Jason McDonald2010-04-221-4/+3
| | | | | | | | This reverts commit 1b3ddbf73ac4db4aa4a6cea4f09dc04644d03ca7.
| * Add new QDataStream version for Qt 4.8.Jason McDonald2010-04-221-3/+4
| |
| * Fix URL for Qt Bug Tracker.Jason McDonald2010-04-221-3/+3
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2264-954/+1775
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Cocoa: fix namespace build breakage Trivial doc fix qdoc: Updated the extra images variable for each manual.qdocconf. Cocoa: cocoa sometimes show a hidden window Default (Parentless) QMenuBar actions do not work (without autotest) Reorganised double stream out operator in QDataStream to avoid causing unnecessary floating point exceptions. Revert "Report the error as being AlreadyExists if this is why it fails" Revert "Default (Parentless) QMenuBar actions do not work" fix memory bug fix nativeFilePath character width issue fix typos Just use the path as the url can have an anchor attached etc... Doc: Cleaning HTML generator and updating index.qdoc Default (Parentless) QMenuBar actions do not work Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCore qdoc: Avoided putting bad chars in links Improve itemview appearance on Mac Backport a few fixes to the Designer filteredit from Creator Doc: Correcting qdocconf files for assistant ScrollBar width not updated dynamically on Windows. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2164-954/+1775
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Cocoa: fix namespace build breakage Trivial doc fix qdoc: Updated the extra images variable for each manual.qdocconf. Cocoa: cocoa sometimes show a hidden window Default (Parentless) QMenuBar actions do not work (without autotest) Reorganised double stream out operator in QDataStream to avoid causing unnecessary floating point exceptions. Revert "Report the error as being AlreadyExists if this is why it fails" Revert "Default (Parentless) QMenuBar actions do not work" fix memory bug fix nativeFilePath character width issue fix typos Just use the path as the url can have an anchor attached etc... Doc: Cleaning HTML generator and updating index.qdoc Default (Parentless) QMenuBar actions do not work Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCore qdoc: Avoided putting bad chars in links Improve itemview appearance on Mac Backport a few fixes to the Designer filteredit from Creator Doc: Correcting qdocconf files for assistant ScrollBar width not updated dynamically on Windows. ...
| | | * Cocoa: fix namespace build breakageRichard Moe Gustavsen2010-04-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Cocoa would not build with namespace. This patch fix makes the day. Reviewed-by: prasanth
| | | * Trivial doc fixHarald Fernengel2010-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | The docs for qDBusRegisterMetaType did not mention the required header at all, since the function is documented as part of QDBusArgument.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-2234-131/+372
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits) Fixes wrong QGraphicsView's viewport cursor reset. Optimize ~QObject Document that QFileSystemWatcher needs to be destroyed before ~QCoreApp Build fix for mingw Fixes keyboard shortcuts for QGraphicsTextItem. Optimize QMetaObject::activate Benchmark emission of signal connected to nothing Micro optimisations in QMutexLocker Fixed assert failure when trying to load invalid SVG file. Added QIcon::name() QDialog: user-moved dialog would not show on the same place after hide Fixed image drawing inconsistencies when drawing 1x1 images/subrects. Fixed pixel-bleeding when stretching subrected pixmaps. Fixed a crash when declaring an animation with Q_GLOBAL_STATIC Add a test to QListView to check initialisation of style option index, similar to QTreeView test. Odf export: Remove double namespace in tab-stops and fix table padding Mac: Fix off-by-one in vertical position for elided and non-elided text QX11GL: Fix bug with pixmaps drawn on multiple top-levels Use QGLContextPrivate to track attribarray enabled state. Don't crash when calling drawPixmapFragements with a null pixmap ...
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-2134-131/+372
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits) Fixes wrong QGraphicsView's viewport cursor reset. Optimize ~QObject Document that QFileSystemWatcher needs to be destroyed before ~QCoreApp Build fix for mingw Fixes keyboard shortcuts for QGraphicsTextItem. Optimize QMetaObject::activate Benchmark emission of signal connected to nothing Micro optimisations in QMutexLocker Fixed assert failure when trying to load invalid SVG file. Added QIcon::name() QDialog: user-moved dialog would not show on the same place after hide Fixed image drawing inconsistencies when drawing 1x1 images/subrects. Fixed pixel-bleeding when stretching subrected pixmaps. Fixed a crash when declaring an animation with Q_GLOBAL_STATIC Add a test to QListView to check initialisation of style option index, similar to QTreeView test. Odf export: Remove double namespace in tab-stops and fix table padding Mac: Fix off-by-one in vertical position for elided and non-elided text QX11GL: Fix bug with pixmaps drawn on multiple top-levels Use QGLContextPrivate to track attribarray enabled state. Don't crash when calling drawPixmapFragements with a null pixmap ...
| | | * | Fixes wrong QGraphicsView's viewport cursor reset.Yoann Lopes2010-04-212-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cursor was reset even when it had not been previously saved. Autotest included. Task-number: QTBUG-7438 Reviewed-by: bnilsen
| | | * | Optimize ~QObjectOlivier Goffart2010-04-211-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By avoiding to lock mutextes when not needed. According to experiment, many object are destroyed without any connection attached to them. (80% with qml, 50% with creator) d->currentSender does not need to be protected by the mutex since we are in the destructor. We do not need Q_TRY since the mutex is grenteed to exist if there is connections. We do not need to call QCoreApplication::removePostedEvents if there is not events to process. And d->postedEvents can be checked outside of the lock since it cannot be incremented anymore in the destructor Reviewed-by: Roberto Raggi Reviewed-by: Brad
| | | * | Document that QFileSystemWatcher needs to be destroyed before ~QCoreAppVolker Hilsheimer2010-04-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QT-3305 Rev-By: Denis
| | | * | Build fix for mingwThierry Bastian2010-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was preventing the activeQt tools to build Don't know exactly why though.... Task-number: 10003 Reviewed-by: Zeno Albisser
| | | * | Fixes keyboard shortcuts for QGraphicsTextItem.Yoann Lopes2010-04-202-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event ShortcutOverride was not handled by QGraphicsTextItem. Autotest included. Task-number: QTBUG-7333 Reviewed-by: bnilsen
| | | * | Optimize QMetaObject::activateOlivier Goffart2010-04-202-28/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly by inlining what should be inlined Reviewed-by: Thiago
| | | * | Benchmark emission of signal connected to nothingOlivier Goffart2010-04-203-2/+11
| | | | |
| | | * | Micro optimisations in QMutexLockerOlivier Goffart2010-04-201-8/+10
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | | * | Fixed assert failure when trying to load invalid SVG file.Kim Motoyoshi Kalland2010-04-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10022 Reviewed-by: Trond
| | | * | Added QIcon::name()Aurelien Gateau2010-04-206-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only works with icons loaded with QIcon::fromTheme() for now. Merge-request: 2367 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-by: jbache
| | | * | QDialog: user-moved dialog would not show on the same place after hideGabriel de Dietrich2010-04-203-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt::WA_Moved was not being set during the move event as notified by the window manager. This is a behavior change for 4.7, but we think it's more user friendly than the previous behavior. Reviewed-by: mbm Task-number: QTBUG-9991
| | | * | Fixed image drawing inconsistencies when drawing 1x1 images/subrects.Samuel Rødal2010-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We special cased 1x1 source rects by calling fillRect() with a solid color, but that produces slightly different rasterization leading to gaps when drawing 9-patch images for example. This patch makes us only use the optimized path for scaling transforms or simpler. Task-number: QTBUG-10018 Reviewed-by: Gunnar Sletta
| | | * | Fixed pixel-bleeding when stretching subrected pixmaps.Gunnar Sletta2010-04-201-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When stretching a subrect of a pixmap we need to clamp the sampling to the subrect. This was done for the ARGB32_Premultiplied target format but not for the generic fallback. This patch adapts the code so that the two code paths are equivalent. Reviewed-by: Samuel
| | | * | Fixed a crash when declaring an animation with Q_GLOBAL_STATICThierry Bastian2010-04-192-32/+56
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: gabi Task-Number: QTBUG-10017
| | | * | Add a test to QListView to check initialisation of style option index, ↵Robin Burchell2010-04-191-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | similar to QTreeView test. Reviewed-by: Olivier Goffart Merge-request: 565
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-196-12/+31
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-195068-173329/+375302
| | | | |\ \
| | | | | * | QX11GL: Fix bug with pixmaps drawn on multiple top-levelsTom Cooksey2010-04-191-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | | | * | Use QGLContextPrivate to track attribarray enabled state.Gunnar Sletta2010-04-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond Reviewed-by: Tom
| | | | | * | Don't crash when calling drawPixmapFragements with a null pixmapGunnar Sletta2010-04-191-0/+3
| | | | | | |
| | | | | * | Swapped x and y values in qt_painterpath_check_crossingGunnar Sletta2010-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kim
| | | | | * | Don't resolve geometry shaders every time...Gunnar Sletta2010-04-191-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a huge extra cost in all QPainter::begin's on GL target surfaces Reviewed-by: Rhys Weatherley
| | | | * | | Mac: Fix off-by-one in vertical position for elided and non-elided textEskil Abrahamsen Blomfeldt2010-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the code path that draws the elided text, we would truncate the position before passing it to the painter. With a font engine that supports fractional values (mac), this would potentially give us the wrong position compared to the code path that draws the complete text, which essentially rounds off the number. The result was that when you resized the width an item view to make its items elide the text, then they would potentially shift up or down by one pixel. Task-number: QTBUG-9879 Reviewed-by: Gunnar
| | | * | | | Odf export: Remove double namespace in tab-stops and fix table paddingEskil Abrahamsen Blomfeldt2010-04-191-6/+6
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the specification, the correct name of the tab-stops element is style:tab-stops (and similar with style:tab-stop). The style namespace seems to have been added twice by mistake in QTextOdfWriter. Also: Fix a copy-paste bug when outputting left, right and bottom padding for table cells. Reviewed-by: Thomas Zander
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-2111-31/+61
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add (correct) .pro files to INSTALLs. Assign UID3, install example files, remove redundant code. Make tst_qdialog::throwInExec work with symbian exception policy Use a compile time constant for the C epoch as a julian day. Fix test failures for qdatetime on symbian and wince Fix compile error in QFileDialog autotest Fix to collections autotest Fixed vendor info in fluidlauncher sis package. Fix default_deployment.pkg_prerules Fix crash on startup on Symbian OS
| | * | | | | Add (correct) .pro files to INSTALLs.Frans Englich2010-04-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Complements previous commit.
| | * | | | | Assign UID3, install example files, remove redundant code.Frans Englich2010-04-212-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This demo still needs work on Symbian, related is QTBUG-10095. Reviewed-by: Jason Barron
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-219-25/+50
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make tst_qdialog::throwInExec work with symbian exception policy Use a compile time constant for the C epoch as a julian day. Fix test failures for qdatetime on symbian and wince Fix compile error in QFileDialog autotest Fix to collections autotest Fixed vendor info in fluidlauncher sis package. Fix default_deployment.pkg_prerules Fix crash on startup on Symbian OS
| | | * | | | Make tst_qdialog::throwInExec work with symbian exception policyShane Kearns2010-04-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Symbian, exceptions are absorbed by the event loop. This behaviour is inside the user library where we can't modify it. Only std::exception or leaves are supported, other exceptions will cause an assert fail in the symbian code. So the test is changed to throw a std::exception derived class Reviewed-by: mread
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-208-24/+43
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use a compile time constant for the C epoch as a julian day. Fix test failures for qdatetime on symbian and wince Fix compile error in QFileDialog autotest Fix to collections autotest Fixed vendor info in fluidlauncher sis package. Fix default_deployment.pkg_prerules Fix crash on startup on Symbian OS
| | | | * | | Use a compile time constant for the C epoch as a julian day.Shane Kearns2010-04-201-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The julian day calculation is complex, so capturing the value and storing as a compile time constant will save some calculations at runtime. Reviewed-by: Thiago Macieira
| | | | * | | Fix test failures for qdatetime on symbian and winceShane Kearns2010-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira