summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| * Fixed a BC break between S60 SDK 3.2 and 5.0.axis2010-12-071-0/+7
| | | | | | | | | | Task: QT-4077 RevBy: Shane Kearns
* | Proposed fix for QTBUG-10499Christian.Ehrlicher2010-12-101-6/+6
| | | | | | | | | | Merge-request: 866 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | Fix a rare race condition when showing windowsHarald Fernengel2010-12-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | When setting a window to translucent shortly before showing it with the OpenGL graphics system, the hijacking would call XDestroyWindow without resetting the internal state. This might lead to the window waiting for a map notify message forever. The patch now properly resets the internal state when destroying the old window, so it'll get mapped correctly when show() is called. Reviewed-by: Denis Dzyubenko
* | Fix QApplication::setGraphicsSystem() since lighthouse integrationGunnar Sletta2010-12-081-1/+0
| | | | | | | | | | | | | | The application set parameter was overridden by this piece of ligthhouse legacy. Reviewed-by: Jørgen Lind
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-12-023-0/+293
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Simple fixes for CI gate Fix compile on QWS Fix code style issues in QScroller QScroller merge, part 1
| * | QScroller merge, part 1Robert Griebl2010-12-023-0/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge consists of the actual kinetic scroller implementation, its autotests plus a few examples. QAbstractScrollArea and QAbstractItemView have been extended to support the new scroll events. The complete history is in http://scm.dev.nokia.troll.no/projects/qt/repos/rgriebls-qt-flickgesture/logs/4.7-flickgesture (part 2 is the QML Flickable replacement / part 3 is QWebView support) Task-number: QTBUG-9054 Reviewed-by: Ralf Engels
* | | Fix spelling in commentJørgen Lind2010-12-021-1/+1
| | |
* | | Spelling mistakes in Documentation. There are probably more :)Jørgen Lind2010-12-013-10/+10
| | | | | | | | | | | | Reviewed-by: paul
* | | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-2919-51/+82
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-251-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix some memory leaks.
| | * | Fix some memory leaks.Fabien Freling2010-11-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the retain/release mechanism for CGContexts. Some leaks were due to unnecessary retain calls. Task-number: QTBUG-15373 Reviewed-by: Samuel Rødal
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-2513-23/+27
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-251-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: fix inf loop bug
| | | * fix inf loop bughawcroft2010-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15409 Reviewed-by: Andrew Den-Exter
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-193-9/+13
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Fixed handling of QInputMethodEvents with nonzero replacementLength. Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. Documented usage of dialogs on Symbian Native file dialog on Symbian^3 Add Location as self signable capability in patch_capabilities.pl Localize .loc and .pkg content based on TRANSLATIONS Bump Qt version to 4.7.2. SSL: Fix for systemCaCertificates being called first on symbian ...
| | | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-182-2/+9
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | | * | Fix for WServ 64 crash on Symbian.Jani Hautakangas2010-11-172-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crash happens if application first sets WA_OpaquePaintEvent flag and then sets WA_TranslucentBackground flag. In that case WA_TranslucentBackground flag is ineffective leading to situation where Qt Symbian adaptation tries to reset native window transparency but because native window is already opaque due to WA_OpaquePaintEvent, WServ 64 crash occurs. Task-number: QTBUG-15369 Reviewed-by: Jason Barron
| | | * | Send WinIdChange event when winId is set to zeroGareth Stockwell2010-11-111-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows an observer to get a notification just before the window handle owned by a native widget is destroyed. Note that, at the point when the event is sent, the widget's internalWinId() will return the new value, but the old native window handle will not be destroyed until after the event handler is run. Task-number: QTMOBILITY-645 Reviewed-by: sroedal
| | * | | Doc: Fixing typoSergio Ahumada2010-11-1611-13/+13
| | | |/ | | |/|
| * | | Add WA_MacNoShadow widget attributeArvid Ephraim Picciani2010-11-241-1/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6831 Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-236-24/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fix compilation on symbian Fix a namespace error and some warnings found by clang optimize ligatureHelper by using qBinaryFind instead of the for loop QFileSystemWatcher: Do not require QApplication in the destructor. Do not define METHOD if QT_NO_KEYWORD is defined. QThreadPrivate::finish should not keep mutex locked when calling signals Make QThreadStorage supports value type and not only pointers. QThreadStorage: fix memory leak if thread storage are added while destroying Compile fix. Fix some warnings on Mac
| | * | | Fix a namespace error and some warnings found by clangJiang Jiang2010-11-236-24/+20
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Fabien Freling
| | * | | Fix some warnings on MacJiang Jiang2010-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Fabien Freling
| * | | | qt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon ↵miniak2010-11-231-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly Merge-request: 769 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | | Revert "Resolve two save/restore geometry issues on X11."Morten Johan Sørvig2010-11-221-1/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit 3b80b70d1464320aee2b38ddeb1ec0d257f6bd1c.
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-191-6/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add script translation test data for plural forms Refactor script translation tests Resolve two save/restore geometry issues on X11. Split newQObject tests into smaller chunks. Compile fix Don't destroy Qt's internal pthread_key_t if it was not initialized
| | * | | Resolve two save/restore geometry issues on X11.Morten Johan Sørvig2010-11-181-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Brad 1: When restoring non-fullscreen geometry we would offset the position if the window was currently fullscreen. This seems wrong; the window geometry is set correctly without the offset. 2: QWidget::geometry() returns erroneous values after restoring old full-screen geometry . The window itself is positioned correctly on screen. This is a very minor use case, let it silently fail.
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-192-2/+9
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| | * | Crash fix, when the Object will be deleted during handling a QGestureEvent.Dominik Holland2010-11-122-2/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | The QGestures will now not be deleted immediatly. QGestureManager waits until all QGestureEvents are processed and will delete the QGestures afterwards. Task: QT-4022 Reviewed By: Zeno Albisser
* | | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-262-12/+18
| | |
* | | Lighthouse: Fix QGLContext::currentContext for systems with limitedJørgen Lind2010-11-242-17/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources. The example plugins EGLFS uses only 1 native context. Make sure that we only use this 1 context, and that we dont wrap it in many different QPlatformGLContexts or QGLContexts instanses. This change also removes the QPlatformWindow link which was made in the initial QPlatformGLContext change. Lighthouse has to support situations where a context isnt bound to a QPlatformWindow. Reviewed-by: gunnar
* | | Adding some documentation for LighthouseJørgen Lind2010-11-228-9/+334
| | | | | | | | | | | | | | | | | | The spirit here is "something is better than nothing". Ie. its the first itteration of documenting the classes. No general Lighthouse introduction yet...
* | | Lighthouse: move the currentContext functionality to QPlatformGLContextJørgen Lind2010-11-223-8/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | This means the threading functionality has been delegated down to QPlatformGLContext. However, it is still possible to use QGLContext::currentContext to retrieve the QGLContext. This so that QGLFunctions, QGLShaderProgram etc can be used without a QGLWidget. Reviewed-by: paul
* | | Lighthouse: Make sure that we call QPlatformWindow::setVisibleJørgen Lind2010-11-221-19/+16
| | | | | | | | | | | | | | | | | | on native child widgets. Reviewed-by: paul
* | | No more windowsurface for QGLWidget in LighthouseJørgen Lind2010-11-223-28/+34
| | | | | | | | | | | | Reviewed-by: paul
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-1920-36/+251
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/gui/text/qfontengine_p.h
| * | Revert "Improve restoring of miximized window geomertry."Morten Johan Sørvig2010-11-171-10/+7
| | | | | | | | | | | | | | | | | | This reverts commit abba37cd0eff959edf2d011842cbf2b36cce8467. Test Failure: tst_qwidget::restoreVersion1Geometry (linux-g++-32)
| * | Use WS_POPUP window style more often on windows.Prasanth Ullattil2010-11-161-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We dont use the WS_POPUP style when one of the following window flags are set (WindowSystemMenuHint, WindowTitleHint, WindowMinMaxButtonsHint WindowCloseButtonHint, WindowContextHelpButtonHint). None of these flags can conflict with this style, hence being removed. Task-number: QTBUG-10589 Reviewed-by: Denis
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-161-7/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Improve restoring of miximized window geomertry. Fix wrong error assumption when converting "0.0" to double
| | * | Improve restoring of miximized window geomertry.Morten Johan Sørvig2010-11-151-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2064 Follow-up commit to 54865d47cfd, which caused a regression on multi-display systems on Windows.
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-151-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Introduced new class QAnimationDriver for plugging in what drives animations Use correct font for menu item shortcuts Fix text rendering offset for raster engine on Mac
| | * | Use correct font for menu item shortcutsJiang Jiang2010-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to use kThemeMenuItemCmdKeyFont for drawing menu item shortcuts, however, Apple is using the same font for both menu item text and shortcuts, it's likely that kThemeMenuItemCmdKeyFont is no longer valid. Change it to kThemeMenuItemFont will make the font for shortcuts consistent with other Mac applications. Task-number: QTBUG-15230 Reviewed-by: Fabien Freling
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-125-2/+99
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-101-1/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Clear X11 structure before use Make operator QRectF const Fix GC-related crash in QScriptValue::setData() get rid of dependency on QtGui Removed implicity QtGui linking from icd.pro as it is not needed. DFB: Make sure QPixmap::hasAlpha is respected fix build on mingw Fix some painting issues in QDirectFBPaintEngine QNAM: Do not need QNetworkSession in AlwaysCache load mode Don't crash if QScriptClass property getter returns an invalid value QNAM: Remove dead waitForUpstreamBytesWritten() code QNAM: Remove dead waitForDownstreamReadyRead() code fix memleak in test
| | | * Clear X11 structure before useHarald Fernengel2010-11-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This squelches valgrind warnings about uninitialized reads Task-number: QT-3973 Reviewed-by: Robert Griebl
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-091-0/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed random crash in QGestureManager.
| | | * | Fixed random crash in QGestureManager.Dominik Holland2010-11-091-0/+4
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | When the cachedGestures are cleaned, the Gestures should be removed in all QSets first, before the Delete. Task: QT-4013 Reviewed By: Frederik Gladhorn
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-053-1/+91
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed test after the fix to QT-4077. Fixed event starvation with pointer events on Symbian.
| | | * Merge branch 'QT-4077-fix' into 4.7-s60axis2010-11-053-1/+91
| | | |\
generated by cgit v0.12 at 2025-01-27 06:47:14 (GMT)