summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QX11GL: Don't do glFinish in endPaintTom Cooksey2010-04-222-7/+0
| | | | | | | | | | | | | | It's better to defer the synchronisation to just before the point it is actually needed. When used as a window surface, this is in flush and scroll. If the QX11GLPixmapData is used as the defaut backend for QPixmaps, it might need to be put back into endPaint. However, the GL driver will hopefully make sure rendering to the pixmap is complete before binding it as a texture via texture-from-pixmap. Also, it's probably better to use eglWaitClient rather than glFinish for synchronisation as it is potentially slightly more optimal. Reviewed-By: TrustMe
* Implement QGLPaintDevice::metric()Tom Cooksey2010-04-222-0/+17
| | | | Reviewed-By: TrustMe
* Remove dead code left after a merge conflict resolutionTom Cooksey2010-04-222-22/+0
| | | | Reviewed-By: Kim
* Fixed autotest failures in tst_QPainterPath.Samuel Rødal2010-04-222-8/+2
| | | | | | | | | | | | The simplified test failed because the ellipse was flattened into line segment. The other tests were due to a behavioral change in contains() and intersect() caused by using fill based intersection in change f7d61dab69308f0993c8a5f2232226d1713ac4a7. This needs to be reverted, since it will return false for a rect containing a line (with no fill area). Instead a different fix was needed in linesIntersect() to prevent testIntersections() in tst_QPathClipper from failing. Reviewed-by: Trond
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-2212-828/+111
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Removed bezier intersection code in path clipper. Diagram scene example (graphicsview/diagramscene) refresh problem. When using Qt::BypassGraphicsProxyWidget with QMenu the application is not stuck anymore
| * Removed bezier intersection code in path clipper.Samuel Rødal2010-04-228-825/+98
| | | | | | | | | | | | | | | | | | | | The bezier intersections caused a lot of numerical stability issues, so instead we now convert them to line segments. In the future it might be possible to keep track of which bezier curve a line segment originated from and reconstruct the bezier curves at the end. Task-number: QTBUG-8035 Reviewed-by: Gunnar Sletta
| * Diagram scene example (graphicsview/diagramscene) refresh problem.Bjørn Erik Nilsen2010-04-221-0/+1
| | | | | | | | | | | | | | | | | | | | Connections between shapes were not updated when moving items around. Problem was that the QGraphicsItem::ItemSendsGeometryChanges flag was not enabled. (Geoemtry changes notifications were disabled by default in 4.6 for performance reasons) Task-number: QT-2482 Reviewed-by: TrustMe
| * When using Qt::BypassGraphicsProxyWidget with QMenu the application is not ↵Alexis Menard2010-04-223-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stuck anymore When using this flag the child of the widget which is embedded is becoming a top level QWidget. So a right click on a text edit trigger the context menu to be top level. When creating this top level context menu we are grabbing the mouse but we were never releasing it when the menu was hidden. The patch check if the widget uses the Qt::BypassGraphicsProxyWidget and ungrab the mouse. The patch also fix a bug when positioning the QMenu, it was for the same reason. Task-number:QTBUG-7254 Reviewed-by:brad
* | 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 git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-2113-25/+62
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2158-949/+1608
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) 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. [tst_qhostinfo] Modify multipleDifferentLookups to repeat hostnames [tst_qhostinfo] Properly clean up the cache and lookup threads. Remove redundant network configuration updates on startup. ...
| | | | * Cocoa: cocoa sometimes show a hidden windowRichard Moe Gustavsen2010-04-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we tell the only window in an app to hide, deactivate the app, and then activate it again, the window will show on screen (and be unresponsive). The reason is that cocoa still sees the window as the main window (and I cannot find a way to tell cocoa otherwise). This patch works around the problem by hiding the window again if it becomes main while being hidden. Reviewed-by: msorvig
| | | | * Default (Parentless) QMenuBar actions do not work (without autotest)Richard Moe Gustavsen2010-04-211-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is a bit nasty. The problem is that Cocoa is trying to be smart behind our back, and enable/disable menu items depending on the menu item targets. But in Qt, we have a different policy that Cocoa on when a menu bar should be disabled or not. E.g. we allow a modal dialog to access the application menu bar if it is the only window on screen. This patch will work around cocoa being smart by setting the menu item targets dynamically, depending on the modal state of Qt. Setting it to nil will make the items enabled when there is a modal dialog on screen, and setting it to the menu loader will enable it when there is _no_ window on screen at all. Task-number: QTBUG-9209 Reviewed-by: prasanth
| | * | | qdoc: Updated the extra images variable for each manual.qdocconf.Martin Smith2010-04-214-4/+160
| | | |/ | | |/|
| | * | Reorganised double stream out operator in QDataStream to avoid causing ↵James Larcombe2010-04-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | unnecessary floating point exceptions. Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | Revert "Report the error as being AlreadyExists if this is why it fails"Morten Johan Sørvig2010-04-213-32/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 73a1291a3f097787f00d79d0d27bd75219bf8e3d. Test failures: qsystemsemaphore::key (unix platforms) All of qsharedmemory (unix, windows)
| | * | Revert "Default (Parentless) QMenuBar actions do not work"Morten Johan Sørvig2010-04-214-77/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 327fabf8e8819b199aa24912ffe6893020b465d4. Test Failures: macnativeevents::testMenuBarWorksForModalDialog (pulse_macx-g++_cocoa_32) macnativeevents::testMenuBarWorksWithoutWindows (pulse_macx-g++_cocoa_32)
| | * | fix memory bugLorn Potter2010-04-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | fixes using MallocScribble crash Task-number: QTBUG-10068
| | * | fix nativeFilePath character width issueOswald Buddenhagen2010-04-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | the variable is a byte array, but it holds wchar_t's. Reviewed-by: joerg
| | * | fix typosOswald Buddenhagen2010-04-207-7/+7
| | | |
| | * | Just use the path as the url can have an anchor attached etc...kh12010-04-202-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the broken topic chooser and keyword resolving. We are only interested in the extention, which fails if we get an url e.g. with anchor attached. Reviewed-by: ck
| | * | Doc: Cleaning HTML generator and updating index.qdocMorten Engvoldsen2010-04-202-73/+68
| | | | | | | | | | | | | | | | | | | | | | | | Adding links to the index page and removing HTML attributes like align and valing form the HTML generator Reviewed-by: Martin Smith
| | * | Default (Parentless) QMenuBar actions do not workRichard Moe Gustavsen2010-04-204-15/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is a bit nasty. The problem is that Cocoa is trying to be smart behind our back, and enable/disable menu items depending on the menu item targets. But in Qt, we have a different policy that Cocoa on when a menu bar should be disabled or not. E.g. we allow a modal dialog to access the application menu bar if it is the only window on screen. This patch will work around cocoa being smart by setting the menu item targets dynamically, depending on the modal state of Qt. Setting it to nil will make the items enabled when there is a modal dialog on screen, and setting it to the menu loader will enable it when there is _no_ window on screen at all. Task-number: QTBUG-9209 Reviewed-by: prasanth
| | * | Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCoreKent Hansen2010-04-203-10/+59
| | | | | | | | | | | | | | | | Cherry-picked from WebKit trunk.
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-2048-224/+383
| | |\ \
| | | * | Improve itemview appearance on MacJens Bache-Wiig2010-04-201-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes two significant issues with the mac look and feel. * Remove superfluous white inner border from item views. This makes items fill all the way to the border. * Remove double border for item view headers. We now clip headers properly to make them blend with the outer border. Reviewed-by: Morten Sørvig Task-number: QTBUG-10047
| | | * | Backport a few fixes to the Designer filteredit from CreatorJens Bache-Wiig2010-04-201-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First problem is that there are too many animations triggered. Second problem is that it doesnt reflect the disabled state. Reviewed-by: thorbjorn
| | | * | Doc: Correcting qdocconf files for assistantMorten Engvoldsen2010-04-204-28/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linking correct files to the qdocconf files Reviewed-by: Daniel Molkentin
| | | * | ScrollBar width not updated dynamically on Windows.Prasanth Ullattil2010-04-202-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever the scrollbar width is changed in the system, Windows sends a WM_SETTINGCHANGE message (with SPI_SETNONCLIENTMETRICS) to all toplevel windows. This will now call updateGeometry() for all QScrollBar based widgets and issue a new QEvent::LayoutRequest. Task-number: QTBUG-9822 Reviewed-by: Jan-Arve
| | | * | [tst_qhostinfo] Modify multipleDifferentLookups to repeat hostnamesThiago Macieira2010-04-201-17/+28
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Markus Goetz
| | | * | [tst_qhostinfo] Properly clean up the cache and lookup threads.Thiago Macieira2010-04-202-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that one test won't interfere with the next Reviewed-by: Markus Goetz
| | | * | Remove redundant network configuration updates on startup.Aaron McCarthy2010-04-2013-17/+34
| | | | | | | | | | | | | | | | | | | | | | | | | The initial list of network configurations was being fetched twice when the bearer management plugins are loaded.
| | | * | make sure to lock theseLorn Potter2010-04-191-0/+6
| | | | |
| | | * | QScript: use JSC::NativeFunctionWrapper instead of JSC::PrototypeFunction ↵Olivier Goffart2010-04-193-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when possible JSC::NativeFunctionWrapper is a typedef to either JSC::PrototypeFunction or JSC::JSFunction depending if we are running JIT or not. When using JIT, JSC::JSFunction is faster, as it allow JIT to do the native call dirrectly. The difference is that in that case, the JS stack is not fully set up so we have to be carefull. Unfortunately, it is not possible to make FunctionWrapper inherit from JSC::NativeFunctionWrapper, because JSFunction is slightly bigger, and we cannot fit in a Cell Reviewed-by: Kent Hansen
| | | * | Quick fix to make the documentation work, needs a proper solution though.kh12010-04-193-4/+23
| | | | | | | | | | | | | | | | | | | | Reviewed-by: kh
| | | * | Don't deadlock tst_QThread::exit() and tst_QThread::quit()Bradley T. Hughes2010-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to lock the mutex before starting the threads... otherwise we run the risk of losing the wakeup between start() and the lock being acquired. Reviewed-by: TrustMe
| | | * | Fix the code for estimate whether the project is debug/release only in cetest.Liang Qi2010-04-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Miikka Heikkinen Reviewed-by: Joerg Bornemann
| | | * | [tst_qdiriterator] Stop removing files from the repository.Thiago Macieira2010-04-191-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue introduced by 21e0423a5c9ecd9da8e141dcfba25e60b55f7fe5. Reviewed-By: João Abecasis
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1915-749/+1226
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc: Added online flag to the qdocconf file. I10n: Update German translations for 4.7.0 Fix compile warning. Report the error as being AlreadyExists if this is why it fails move network scan to thread.
| | * | | | qdoc: Avoided putting bad chars in linksMartin Smith2010-04-202-7/+10
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-195-284/+648
| | |\ \ \
| | | * | | I10n: Update German translations for 4.7.0Friedemann Kleint2010-04-195-284/+648
| | | | | |
| | * | | | qdoc: Added online flag to the qdocconf file.Martin Smith2010-04-194-141/+157
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To generate the offline docs, do nothing. To generate the online docs, add this to your qdocconf file: "online = true"
| | * | | Fix compile warning.Friedemann Kleint2010-04-191-1/+1
| | | | |
| | * | | Report the error as being AlreadyExists if this is why it failsAndy Shaw2010-04-193-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows it would never report this error, and on Unix it would report a different error ulimately instead as it tried to obtain the semaphore a second time which could cause a different error to what should be reported. Task-number: QTBUG-9610 Reviewed-by: Frans Englich
| | * | | move network scan to thread.Lorn Potter2010-04-192-320/+388
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increases startup time. Task-number: QTBUG-9722
* | | | | 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 ...