summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2111-21/+36
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fixes compilation on MSVC 64 QtWebKit: Remove translatable strings from tests/hybridPixmap. Remove overloaded placement new operators WINSCW compiler fix, too eager to solve inlines WINSCW boolean fix for XPATH WINSCW compile fix for HashMap WINSCW compile fix for WebCore
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-2011-21/+36
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fixes compilation on MSVC 64 QtWebKit: Remove translatable strings from tests/hybridPixmap. Remove overloaded placement new operators WINSCW compiler fix, too eager to solve inlines WINSCW boolean fix for XPATH WINSCW compile fix for HashMap WINSCW compile fix for WebCore
| * | QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-193-4/+4
| | | | | | | | | | | | | | | | | | This patch should be overwritten by the next import of QtWebKit trunk Reviewed-by: TrustMe
| * | QtWebKit: Remove translatable strings from tests/hybridPixmap.Jocelyn Turcotte2010-04-191-5/+5
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Remove overloaded placement new operatorsJanne Koskinen2010-04-192-2/+0
| | | | | | | | | | | | | | | | | | WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann
| * | WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-191-2/+4
| | | | | | | | | | | | | | | | | | | | | WINSCW tries immediately solve inlines causing forward declared classes to be used before they are defined. Reviewed-by: Simon Hausmann
| * | WINSCW boolean fix for XPATHJanne Koskinen2010-04-192-2/+16
| | | | | | | | | | | | | | | | | | | | | WINSCW cannot determine boolean type unless it is explicitly defined. This fix needs to be re-applied always when files are regenerated. Reviewed-by: Simon Hausmann
| * | WINSCW compile fix for HashMapJanne Koskinen2010-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | WINSCW with templates function declarations and definitions will have to use same names for variables or you get 'undefined identifier' Reviewed-by: Miikka Heikkinen
| * | WINSCW compile fix for WebCoreJanne Koskinen2010-04-191-2/+3
| | | | | | | | | | | | | | | | | | | | | WINSCW fails to parse function pointer name if it is not introduced before use. Reviewed-by: Miikka Heikkinen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1915-128/+147
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Some QWindowSurface implementations might implement flush as a buffer Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets Cleanup & remove unused function overloads from QEgl* APIs QScrollArea: Excessive scrolling in focusNextPrevChild()
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1815-128/+147
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Some QWindowSurface implementations might implement flush as a buffer Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets Cleanup & remove unused function overloads from QEgl* APIs QScrollArea: Excessive scrolling in focusNextPrevChild()
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1715-128/+147
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Some QWindowSurface implementations might implement flush as a buffer Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets Cleanup & remove unused function overloads from QEgl* APIs QScrollArea: Excessive scrolling in focusNextPrevChild()
| | | * | Some QWindowSurface implementations might implement flush as a bufferBjørn Erik Nilsen2010-04-165-24/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flip. Such window surfaces therefore destroy the contents during flush. In order to render correctly on these surfaces, any update, no matter how small, needs to trigger the entire window to be redrawn. Auto test included. Task-number: Relates to QTBUG-9978 Reviewed-by: tom
| | | * | Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgetsTom Cooksey2010-04-162-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidgets are assumed to be buffer destroyed, however regular QWidgets assume they can to partial updates and thus need the preserved swap behaviour. Reviewed-By: Trond Task-number: QTBUG-9554
| | | * | Cleanup & remove unused function overloads from QEgl* APIsTom Cooksey2010-04-168-102/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make stubbing out these APIs slightly easier. Reviewed-By: TrustMe
generated by cgit v0.12 at 2024-10-26 16:31:18 (GMT)