summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-301-0/+3
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for unsigned smart installer package creation in Symbian Fix QApplication::desktop()->availableGeometry() for Symbian QS60Style: Possible NULL pointer use when drawing frame
| * Fix QApplication::desktop()->availableGeometry() for SymbianMiikka Heikkinen2010-09-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Since screen geometry changes before client area geometry is changed in Eikon, we need to send two resize events, one for screen area change and one for client area change. Note that the correct way to detect client area change in applications is to connect to QApplication::desktop() signal workAreaResized(int) instead of filtering for resize events meant for QDesktopWidget. Task-number: QTBUG-14058 Reviewed-by: Jason Barron
* | Update frameGeometry when the unified toolbar visiblity is toggledAndy Shaw2010-09-291-0/+1
|/ | | | | | | | | | | When the unified toolbar visiblity was toggled on Carbon then it would not have a correct frameGeometry as it would have a top position different to what it should have been as the window does not move. Autotest included in this commit. Task-number: QTBUG-14055 Reviewed-by: Prasanth
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-271-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added my changes to the changelog. Clarified documentation of loadFinished() signal. Added a condition to skip obsolete functions during the threadness check. Doc: call qApp->precessEvents after QSplashScreen::showMessage Doc: Said that QApplication exits when not able to open X11 display Doc: maintainance - fixing grammar and spelling Doc: Added a note to qmake INSTALLS docs Doc: Fixing overlapping text problem in columns Doc: Added info on QWidget::render to printing docs Added default value documentation for two variables.
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-242-8/+13
| |\
| * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-242-2/+1
| |\ \
| * | | Doc: Said that QApplication exits when not able to open X11 displayGeir Vattekar2010-09-241-0/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13377 Reviewed-by: Jerome Pasion
* | | | Made the Symbian menu close when switching native focus.axis2010-09-271-0/+4
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This was required to avoid windows appearing on top of the popup menu, preventing both the menu and the softkeys from being used. Task: QTBUG-9965 AutoTest: Included RevBy: Jason Barron
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-231-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Designer: Minor BT issue: '-' button in Signal/Slot editor not updated. Changelog: 4.7.1 (uic/Designer). Incorrect translations for application menu items on Mac OS X. Update the changelog with the SSE work done for Qt 4.7.1 build configure.exe directly in source dir fix build key generation for real my changes for 4.7.1 My Qt 4.7.1 changes
| * | | Incorrect translations for application menu items on Mac OS X.Prasanth Ullattil2010-09-231-2/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | This is a regression fron 4.6 release. Menu entries with some specific roles are automatically merged to the application menu. They are now translated based on the context "MAC_APPLICATION_MENU" instead of "QMenuBar" context. This patch eanbles the use for both contexts. Task-number: QTBUG-13878 Reviewed-by: Richard Moe Gustavsen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-221-6/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix warning on MSVC QThread: make sure start works even if called after exit Revert "Fixed painter path drawing on FBO without stencil buffer." Fix a crash with D&d on mingw Revert "Keep other text format with QTextOption::SuppressColors tag on" Fixed stencil buffer on FBOs with OpenGL ES. Keep other text format with QTextOption::SuppressColors tag on QTreeView: do not scroll to top if last item is removed
| * | Fix a crash with D&d on mingwThierry Bastian2010-09-221-6/+6
| |/ | | | | | | | | | | | | | | The Drag&Drop callbacks need to be correctly aligned to not crash in the graphics SSE code. Task-number: QTBUG-13787 Reviewed-by: benjamin poulain
* | fix build with QT_NO_GESTURESRomain Pokrzywka2010-09-211-1/+1
| |
* | remove extra includesRitt Konstantin2010-09-211-1/+0
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-172-0/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make qml debugging work with command line arguments Fix example after changes to font.letterSpacing. Autotest and small fix for QDeclarativeFontLoader. Improve error messages Changes to objects returned from get() should emit itemsChanged() so Make it clear that private ListModel constructor is only for worker Remove duplicated move() implementations Doc changes Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit PathView didn't accept mouse events, preventing it from working in a Flickable. Moving items in a PathView caused PathView.onPath to be set to false. Fix worker agent to emit ListModel itemsChanged() correctly when set()
| * Make qml debugging work with command line argumentsLasse Holmstedt2010-09-172-0/+8
| | | | | | | | | | | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-171-0/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Export qt_directfb_.* functions in plugin as well Added autotest for QPixmap::size() with null pixmaps. Update Symbian def files. QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBoundingRect(). Wrong bounding rect returned by QGraphicsEffect::boundingRect(). Compile on Mac Ensure building of WebKit and QtConcurrent are disabled with SunCC.
| * Compile on MacEskil Abrahamsen Blomfeldt2010-09-161-0/+3
| | | | | | | | | | | | Extern missing symbol Reviewed-by: Fabien Freling
* | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-1510-22/+70
|\ \ | |/ | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-141-2/+4
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix QTBUG-13501 - crash when a gesture is accepted but not consumed Add test: assert when gesture is never accepted.
| | * fix QTBUG-13501 - crash when a gesture is accepted but not consumedJeremy Katz2010-09-141-2/+4
| | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-141-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed audio-backend detection in configure tests. Added support for using -L notation in the LIBS variable. Remove redundant code in SgImage -> VGImage conversion on Symbian. Fix incorrect dialog positioning on Symbian Eliminated duplicated code from library handling. Add QtOpenGL .def files Moved the sis_targets feature profile to the correct directory.
| | * Fix incorrect dialog positioning on SymbianGareth Stockwell2010-09-141-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QT-3900 Reviewed-by: Jason Barron Reviewed-by: Sami Merila
| * | Fix compile warnings.Friedemann Kleint2010-09-141-1/+2
| | | | | | | | | | | | Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
| * | expose GestureType for using in QMLZeno Albisser2010-09-141-0/+1
| |/ | | | | | | Reviewed-by: Denis Dzyubenko
| * Make compile.Aaron McCarthy2010-09-141-1/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-137-17/+61
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) run depend_command even if the binary has no absolute path fix scaleFactor/totalScaleFactor in QPinchGestureRecognizer Added velocity property to the QPanGesture. Changed the speed property on QSwipeGesture to velocity fix typos in comment unbreak test Don't add generic subdirs project twice. Remove debug, quiet warnings. Fix memory leaks and valgrind errors. QStroker: Fix erroneous SvgMiterJoin behavior for parallel lines Revert "Properly implement qobject_cast for const pointers." Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter ...
| | * fix scaleFactor/totalScaleFactor in QPinchGestureRecognizerZeno Albisser2010-09-132-6/+6
| | | | | | | | | | | | | | | | | | | | | The scaleFactor/totalScaleFactor should now represent a proper value to allow an object tracking a touchpoint during a Pinch Gesture. Reviewed-by: Frederik Gladhorn
| | * Added velocity property to the QPanGesture.Zeno Albisser2010-09-132-1/+10
| | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | * Changed the speed property on QSwipeGesture to velocityZeno Albisser2010-09-134-5/+11
| | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | * fix typos in commentFrederik Gladhorn2010-09-131-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-112-4/+33
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter NTLM code: Save domain in different variable Update the error handling of invalid hostnames in QUrl. Remove unsupported code from qobject.h for MSVC < .NET 2003 Properly implement qobject_cast for const pointers. Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-102-4/+33
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter NTLM code: Save domain in different variable Update the error handling of invalid hostnames in QUrl. Remove unsupported code from qobject.h for MSVC < .NET 2003 Properly implement qobject_cast for const pointers. Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
| | | | * Implement a private API for setting title widgetsHarald Fernengel2010-09-101-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meego and Orbit use client side decorations, so implement a top-level layout in QMainWindow that allows us to set title widgets. To prevent regressions on other platforms, the API is disabled by default. Rev-By: Robert Griebl Rev-By: Thierry Bastian
| | | | * Added private API to install an x11EventFilterHarald Fernengel2010-09-101-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some libs need to intercept X11 events without actually being able to subclass QApplication, so add a private API to allow setting event filter functions. Reviewed By: Robert Griebl
* | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-131-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Remove compiler warning in qapplication.cpp.Jason Barron2010-09-131-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Fix a warning since we were deleting the graphics_system instance, but the type was only forward declared. Reviewed-by: Samuel
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-111-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-101-0/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix crash in QRuntimeGraphicsSystem due to destruction order. Fix crash in OpenVG when failing to allocate large VGImages. Updated 4.7.0 changelog
| | * | Fix crash in QRuntimeGraphicsSystem due to destruction order.Jason Barron2010-09-101-0/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firstly, fix a "leak" by deleting the graphics system when QApplication is destroyed. Secondly, fix a crash when the following scenario occurs: - ~QApplication() deletes the current graphics system (see above) - ~QApplication() calls qt_cleanup() - qt_cleanup() calls QPixmapCache::clear() to delete pixmaps - ~QRuntimePixmapData() tries to remove the pixmap from the runtime graphics system, but it has already been deleted. - *Crash* Reviewed-by: Gunnar Sletta Reviewed-by: Jani Hautakangas
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-101-0/+24
|\ \ \ | |/ /
| * | Force MeeGo touch to use native graphics system for now.Samuel Rødal2010-09-101-0/+24
| |/ | | | | | | | | | | | | MeeGo touch doesn't yet work with other graphics systems since it assumes that QPixmaps are XPixmap based. If MeeGo touch doesn't link against the graphics system helper we'll force it to use the native graphics system.
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-094-27/+25
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Let's not duplicate Symbian softkey menu top-level actions in submenu. Remove some .pro statements left behind after IAP usage cleanup Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.
| | * Let's not duplicate Symbian softkey menu top-level actions in submenu.Janne Anttila2010-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code incorrectly added the toplevel menu to menubar, where as submenu should have been added. This change only has impact to case where menu is being manually constructed by creating softkey action with menu and by adding actions to that menu. Normal "Options" menus are already working correctly. Task-number: QTBUG-12189 Reviewed-by: Miikka Heikkinen
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-09-073-26/+24
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Add missing license header Fixed input context trying to squeeze content into a full widget. Cleaned up position tracking in the Symbian input methods. Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work" Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it. Compile fix WinCE Ensure that we load system libraries from the correct location. Some small Solaris fixes. Fix QtScript Date <--> QDateTime (local time) conversion Fix Qt applications freezing until mouse/keyboard events occur. Recognize GL_ARB_shader_objects as indicating shaders
| | * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-09-073-26/+24
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Add missing license header Fixed input context trying to squeeze content into a full widget. Cleaned up position tracking in the Symbian input methods. Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work" Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it. Compile fix WinCE Ensure that we load system libraries from the correct location. Some small Solaris fixes. Fix QtScript Date <--> QDateTime (local time) conversion Fix Qt applications freezing until mouse/keyboard events occur. Recognize GL_ARB_shader_objects as indicating shaders
| | | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-073-26/+24
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-063-26/+24
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add missing license header Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it. Compile fix WinCE Ensure that we load system libraries from the correct location.
| | | | | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-033-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a security hole that has been there for a while, but the public awareness have recently rised so the threat is more imminent now. The solution is to fix all places where we dynamically load system libraries. More specifically, we now load all system libraries with an absolute path that points to a library in the system directory (usually c:\windows\system32). We therefore introduce a small class named QSystemLibrary that only loads libraries located in the system path. This shares some of the API with QLibrary (in order to make the patch as small as possible). We don't fix QLibrary due to risk of regressions. In addition, applications can fix the code that calls QLibrary themselves. The problem does not apply to Windows CE, since the search order is documented as not searching in the current directory. However, it touches some CE-specific code - therefore QSystemLibrary is sometimes used on WinCE (however, it will just do a normal LoadLibrary() since its safe anyway). This change does not affect the testability plugin (it is not clearly documented where that plugin is located, and the plugin should never be used in production code anyway) Loading OpenSSL libraries The ssl libraries are handled specially, and searched in this order (we cannot expect them to always be in the system folder): 1. Application path 2. System libraries path 3. Trying all paths inside the PATH environment variable Task-number: QT-3825 Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
generated by cgit v0.12 at 2025-09-13 13:22:29 (GMT)