summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-2713-40/+742
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2759-482/+3080
| |\
| | * Add unit tests for a number of QList methods.Robin Burchell2010-04-271-0/+489
| | | | | | | | | | | | | | | | | | | | | | | | Granted, if this breaks, it will be noticed quickly - but it is desirable to catch such problems at test time rather than in production. Merge-request: 575 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Crash while dragging on Mac OS X (Cocoa)Prasanth Ullattil2010-04-271-1/+2
| | | | | | | | | | | | | | | | | | | | | This happens only if a new drag is started while a drag operation is going on. It seems to be an unsupported operation on Mac. Reviewed-by: Fabien Freling
| | * Doc & menubar hidden for QtDemo after switching back from fullscreenCarlos Manuel Duclos Vergara2010-04-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here was fix for bug QTBUG-8933. In order to fix that bug we added a new call to the SetSystemUIMode(...) system call, but I forgot to update the status inside Qt, so the system didn't know it was in full screen mode. Task-number: QTBUG-9883 Reviewed-by: Prasanth
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-277-6/+227
| | |\
| | | * QTabWidget documentMode not working correctly on MacCarlos Manuel Duclos Vergara2010-04-277-6/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature was implemented in Carbon and was never ported to Cocoa. The major problem is the fact that Cocoa draws a line under the titlebar, regardless of what we say. The only way to avoid drawing that line is by adding a native toolbar and ask it not to draw its baseline. If there is not toolbar, as it happens in this case, there is no way to prevent that line from being drawn. So instead we paint over that line and hope for the best. Task-number: QTBUG-8159 Reviewed-by: Richard Moe Gustavsen
| | * | qdoc: Added breadcrumbs for class pages.Martin Smith2010-04-272-27/+19
| | |/
| * | Merge commit 'refs/merge-requests/577' of git://gitorious.org/qt/qt into ↵David Boddie2010-04-271-6/+2
| |\ \ | | | | | | | | | | | | integration
| | * | Slight QList documentation fix.Robin Burchell2010-04-261-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | Mentioning that the operation is constant time is fine, however, saying that it is fast because it preallocates 'to allow fast growth' seems a little bit confusing given these methods are related to item removal.
* | | | Doc: updating and cleaning up redundant HTML code in the HTML generatorMorten Engvoldsen2010-04-273-365/+479
| |_|/ |/| | | | | | | | | | | | | | Moved element attribute class="fn" from <div> to <li>. Removed redundant <div>s Reviewed-by: Martin Smith
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-27321-2938/+10746
|\ \ \
| * | | changes-4.7.0 updatedJoerg Bornemann2010-04-271-0/+25
| | | |
| * | | Update Polish translationJarek Kobus2010-04-271-316/+2044
| | | |
| * | | Cocoa: Native QFileDialog has problems selecting name filterRichard Moe Gustavsen2010-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem occured if you told the dialog to not show name filter details, then tried to select a filter specifying those details. The patch makes sure that we accept a filter as found in the drop down list if it matches the specified filter with or without details Task-number: QTBUG-8439 Reviewed-by: msorvig
| * | | Mac: improve mac native events autotest APIRichard Moe Gustavsen2010-04-272-6/+0
| | | | | | | | | | | | | | | | Make it possible to add a delay between two events
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-04-271656-9161/+24745
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-2611-40/+28
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: add translator comment save a QFile::encodeName() Don't use QList's begin() and end() where possible. Ensure we stop the name lookups in QAbstractSocket if we abort(). Don't rely on tryStart() to do job control. Improved workaround for new qt documentation, base on dboddie's work. Doc: Fixed typos. Ensure that all qthelp URLs have paths that start with /qdoc/. Doc: Fixed the Declarative documentation set. Tweaked the others.
| | | * | | add translator commentOswald Buddenhagen2010-04-261-0/+3
| | | | | |
| | | * | | save a QFile::encodeName()Oswald Buddenhagen2010-04-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joao
| | | * | | Don't use QList's begin() and end() where possible.Robin Burchell2010-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids an unnecessary iterator creation, which can speed up some cases. Merge-request: 2371 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
| | | * | | Ensure we stop the name lookups in QAbstractSocket if we abort().Thiago Macieira2010-04-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're not even going to connect, there's no point in trying to get the host resolution Reviewed-By: Markus Goetz
| | | * | | Don't rely on tryStart() to do job control.Thiago Macieira2010-04-261-4/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It may fail but threads become available the next instant. Instead, simply use our own currentLookups count. Reviewed-by: Markus Goetz
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-261508-7802/+22130
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp
| | | | * | Improved workaround for new qt documentation, base on dboddie's work.kh12010-04-263-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the check more generic, to also work for all other Qt namespaces than qt.ver.s.ion. Still there's something broken in Qt webkit or so. Backported from Qt Creator code. Reviewed-by: ck
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-233-16/+42
| | | |\ \ \
| | | * | | | 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
| | | * | | | | Doc: Fixed the Declarative documentation set. Tweaked the others.David Boddie2010-04-225-26/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-2613-75/+121
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: DEF file updates for BWINS and EABI for Symbian Fix typo Revert "Add QML imports to s60installs.pro" Assigned a UID3 to qml.exe.
| | | * | | | | | DEF file updates for BWINS and EABI for SymbianIain2010-04-2610-54/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | Fix typoThomas Zander2010-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | Revert "Add QML imports to s60installs.pro"Thomas Zander2010-04-261-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e1b1b11afbddbe260d4de61f20181ffd3b941996. Seems this was not tested, it doesn't work.
| | | * | | | | | Assigned a UID3 to qml.exe.Frans Englich2010-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocated in S60 Team's wiki over UID3s in Qt.
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-266-27/+48
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Remove stray qDebug Don't leak objects if QX11GLSharedContexts is instanciated twice Enable QX11GLWindowSurface using "-graphicssystem x11gl" option Force full-screen updates for QGLWindowSurface
| | | * | | | | | Remove stray qDebugTom Cooksey2010-04-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-265-26/+48
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't leak objects if QX11GLSharedContexts is instanciated twice Enable QX11GLWindowSurface using "-graphicssystem x11gl" option Force full-screen updates for QGLWindowSurface
| | | | * | | | | Don't leak objects if QX11GLSharedContexts is instanciated twiceTom Cooksey2010-04-261-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If two threads call the Q_GLOBAL_STATIC accessor at the same time, two QX11GLSharedContexts objects can be created with one being destroyed. Reviewed-By: TrustMe
| | | | * | | | | Enable QX11GLWindowSurface using "-graphicssystem x11gl" optionTom Cooksey2010-04-265-23/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the OpenGL graphics system is in X11GL mode, it will use the QX11GLWindowSurface for all widgets except QGraphicsViews with the FullViewportUpdate update mode set, where it will use the regular QGLWindowSurface, as this is probabbly faster. QX11GLWindowSurface differs from QGLWindowSurface because it allows accelerated scrolling and partial updates, while still being using opengl to do rendering. Task-number: QT-280 Task-number: QT-2625 Reviewed-By: Trond
| | | | * | | | | Force full-screen updates for QGLWindowSurfaceTom Cooksey2010-04-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the back buffer is destroyed when swap buffers is called, we must tell the backing store any update needs to invalidate the entire window surface, so everything gets re-drawn. Task-number: QTBUG-9978 Reviewed-By: Trond
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-261-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: correcting a character bug in the footer.
| | | * | | | | | Doc: correcting a character bug in the footer.Morten Engvoldsen2010-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation>\n" \ into "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ Reviewed-by: trust me
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-24259-2240/+7509
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (28 commits) Fix all qmake Makefiles to include the MSBuild backend Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. ...
| | | * | | | | | Fix all qmake Makefiles to include the MSBuild backendMarius Storm-Olsen2010-04-244-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-24256-2234/+7485
| | | |\ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits) Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. ...
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-24256-2234/+7485
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits) Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. ...
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-23256-2234/+7485
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits) Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. ...
| | | | | * | | | | | Remove trace code from directshowaudioendpointcontrol.h.Andrew den Exter2010-04-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quack. Reviewed-by: Justin McPherson
| | | | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-04-2319-17/+5099
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7
generated by cgit v0.12 at 2025-02-11 19:09:28 (GMT)