summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-041-1/+1
|\ | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Clarified sendCustomRequest documentation to include HTTPS
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-031-1/+1
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-031-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Clarified sendCustomRequest documentation to include HTTPS
| | | * Clarified sendCustomRequest documentation to include HTTPSJanne Anttila2011-05-031-1/+1
| | | | | | | | | | | | | | | | Reviewed-By: mgoetz
* | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-05-0430-133/+318
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: Remove warnings Fix Wayland plugin so it works with the wayland bind api wayland: Track wayland changes Support GL ES 2 with uikit. Lighthouse: Fix virtual desktopwidget Added missing function in QWaylandWindow. wayland: Drop a debug qWarning() wayland: Discard motion and button events receive with a NULL pointer focus wayland: Include eglconvenience.pri instead of pulling in individual file wayland: Remove unused EGLConfig field wayland: Add native access interface for Wayland plugin Compile fix for QPA's session manager. Fixes compilation of wayland plugin after latest changes in wayland.
| * | | | Remove warningsJørgen Lind2011-05-033-1/+3
| | | | |
| * | | | Fix Wayland plugin so it works with the wayland bind apiJørgen Lind2011-05-035-50/+26
| | | | | | | | | | | | | | | | | | | | | | | | | This is mostly for the xcomposite api, but also we needed to readEvents after doing a connect
| * | | | wayland: Track wayland changesKristian Høgsberg2011-04-285-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Pass version number when creating proxies, use wl_ prefix when looking up interfaces and drop wl_egl_display.
| * | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-28519-12938/+56746
| |\ \ \ \
| * | | | | Support GL ES 2 with uikit.con2011-04-276-43/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For GL ES 2 teach the paint device about the fact that it is doing rendering backed by a framebuffer object, not a system framebuffer (which doesn't exist).
| * | | | | Lighthouse: Fix virtual desktopwidgetJørgen Lind2011-04-202-9/+4
| | | | | |
| * | | | | Added missing function in QWaylandWindow.Samuel Rødal2011-04-191-0/+3
| | | | | |
| * | | | | wayland: Drop a debug qWarning()Kristian Høgsberg2011-04-191-3/+0
| | | | | |
| * | | | | wayland: Discard motion and button events receive with a NULL pointer focusKristian Høgsberg2011-04-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we destroy a surface we NULL out mPointerFocus and mKeyboardFocus pointers, but the server may still send a few events out before it receives the destroy request. Discard such events.
| * | | | | wayland: Include eglconvenience.pri instead of pulling in individual fileKristian Høgsberg2011-04-191-5/+4
| | | | | |
| * | | | | wayland: Remove unused EGLConfig fieldKristian Høgsberg2011-04-191-1/+0
| | | | | |
| * | | | | wayland: Add native access interface for Wayland pluginKristian Høgsberg2011-04-195-0/+144
| | | | | |
| * | | | | Compile fix for QPA's session manager.con2011-04-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include QApplication, so the compiler definitely knows that it's a QObject. Reviewed-by: Paul Olav Tvete
| * | | | | Fixes compilation of wayland plugin after latest changes in wayland.Samuel Rødal2011-04-181-0/+1
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-05-032-3/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Fix drawing text in item view: Fix the tst_QPluginLoader::loadCorruptElf on 64 bit
| * | | | | | Fix drawing text in item view:Olivier Goffart2011-05-031-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put back code that was removed by mistake in e8019cf8feb402303e6d253f5ca58bebfda42679 Task-number: QTBUG-18998
| * | | | | | Fix the tst_QPluginLoader::loadCorruptElf on 64 bitOlivier Goffart2011-05-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message do not match Reviewed-by: Arvid Ephraim Picciani
* | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-0333-336/+1446
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits) Fixing potential js hole in the js function for the feedback channel. Fix tst_Q3ProgressBar::setProgress, again Disable tst_Q3ComboBox::task231724_clear on Mac Fix tst_Q3ProgressBar::setProgress() Revert "Fix double painting when adding an item into a linear layout" Add missing license headers Revert "Fixed a crash in QListView" qdoc: Completed task QTBUG-18790 qdoc: Completed task QTBUG-18733 Benchmark for layout hierarchies Manual test for layout flickering Improve invalidate() testcase. Avoid flicker when invalidate is propagated in a widget/layout hierarchy Do not call setSizePolicy from ctor, it might call a virtual function qdoc: Last commit before merge into master. Fixed a crash in QListView Doc: Fixed reference to a name in a table. qdoc: Fixed license comment. Ensured that incomplete downloads are removed. qdoc: Added missing copyright notice ...
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-0333-336/+1446
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicslayout.cpp src/gui/graphicsview/qgraphicslayout_p.cpp
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-05-0215-204/+312
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fixing potential js hole in the js function for the feedback channel. qdoc: Completed task QTBUG-18790 qdoc: Completed task QTBUG-18733 qdoc: Last commit before merge into master. Doc: Fixed reference to a name in a table. qdoc: Fixed license comment. Ensured that incomplete downloads are removed. qdoc: Added missing copyright notice qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Fixed QTBUG-18591 Aim to fix Windows builds.
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-0215-204/+312
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-291-1/+1
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Fixing potential js hole in the js function for the feedback channel.
| | | | | * | | | | Fixing potential js hole in the js function for the feedback channel.Morten Engvoldsen2011-04-291-1/+1
| | | | | | | | | |
| | | | * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-151-0/+2
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Completed task QTBUG-18790
| | | | | * | | | | qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
| | | | | | | | | |
| | | | * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-145-125/+74
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Completed task QTBUG-18733
| | | | | * | | | | qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
| | | | | | | | | |
| | | | * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-132-1/+27
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Last commit before merge into master.
| | | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-133-2/+10
| | | | | |\ \ \ \ \
| | | | | * | | | | | qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a function to class Config to unload the qdocconf file. This is for the qdoc wizard.
| | | | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-113-2/+10
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixed reference to a name in a table. Ensured that incomplete downloads are removed.
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-111-21/+7
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | * | | | | | Doc: Fixed reference to a name in a table.David Boddie2011-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18679
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-073-50/+184
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | Ensured that incomplete downloads are removed.David Boddie2011-04-072-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18509
| | | | * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-081-21/+7
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Fixed license comment.
| | | | | * | | | | | | qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| | | | | | |/ / / / / | | | | | |/| | | | |
| | | | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-075-75/+210
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Added missing copyright notice qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. qdoc: Updated the QDoc manual. Aim to fix Windows builds.
| | | | | * | | | | | qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| | | | | | | | | | |
| | | | | * | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| | | | | | | | | | |
| | | | | * | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| | | | | | | | | | |
| | | | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-071-1/+3
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-064-24/+25
| | | | | | |\ \ \ \ \
| | | | | | * | | | | | Aim to fix Windows builds.David Boddie2011-04-051-1/+3
| | | | | | | | | | | |
| | | | | * | | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-072-39/+128
| | | | | | |/ / / / / | | | | | |/| | | | |
generated by cgit v0.12 at 2025-09-07 10:36:46 (GMT)