summaryrefslogtreecommitdiffstats
path: root/src/gui/util
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix Xrandr DPI calculation for NVidia TwinView.Robert Griebl2011-01-241-2/+11
| | | | | | | | | | | | | | The problem is that a Xinerama 'screen' (as used by QDesktopWidget) does NOT correspond to a Xrandr 'screen', so we have to convert via the root windows. Reviewed-by: Ralf Engels
* | Review and improve scroller documentationRalf Engels2011-01-242-129/+127
| |
* | Improve overshooting behaviourRalf Engels2011-01-241-11/+14
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1725-25/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1025-25/+25
| | | | | | | | Reviewed-by: Trust Me
* | Removed obsolete Maemo 5 codeRobert Griebl2010-12-151-23/+1
| |
* | QScroller: nicer Overshoot bounce back animation.Robert Griebl2010-12-151-3/+2
| | | | | | | | Reviewed-by: Ralf Engels
* | Use XRandR to get the real DPI values for the screen.Robert Griebl2010-12-151-12/+24
| | | | | | | | | | | | This is needed for the Xomap server, but may also apply to others. Reviewed-by: Ralf Engels
* | Fix drag velocity smoothing in QScroller.Robert Griebl2010-12-152-10/+15
| | | | | | | | | | | | The algorithm used for smoothing the drag velocity was wrong in many ways. Reviewed-by: Ralf Engels
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-12-0210-0/+3861
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Simple fixes for CI gateRobert Griebl2010-12-023-4/+4
| | |
| * | Fix compile on QWSRobert Griebl2010-12-021-1/+1
| | |
| * | Fix code style issues in QScrollerRobert Griebl2010-12-022-4/+4
| | |
| * | QScroller merge, part 1Robert Griebl2010-12-0210-0/+3861
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-293-101/+98
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-253-101/+98
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-s60-public into ↵Qt Continuous Integration System2010-11-192-101/+98
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | | * Fixed code style of d92cbfc5, reported by git push.Janne Anttila2010-11-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82: TAB character in non-leading whitespace 348: Flow control keywords must be followed by single space 356: Flow control keywords must be followed by single space Rev-By: TrustMe
| | | * Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.Janne Anttila2010-11-152-84/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SchemeHandler is plugin extensible component to handle several different URI schemes. By default schemes such as http, https, rtsp, mailto, file, wtai, tel and cti are supported. In some devices/platforms also other schemes might be supported. This commit only defines the USE_SCHEMEHANDLER macro and re-orders the qdesktopservices_s60 source code to make it more readable and to make it compile both with and without the flag. The actual implementation was provided at the same time when qdesktopservices for symbian was initially implemented. Why support is enabled only for Symbian^3 and later? SchemeHandler component does not exist in S60 3.1 - 5.0 public SDKs, actually it does not exist also in Forum Nokia provided Symbian^3 SDK, but is available in Symbian^3 PDK. Since building Qt for Symbian^3 anyway require PDK and because the release builds for Symbian^3 are done separately from older Symbian versions, PDK dependency should be Ok. It might be that SchemeHandler headers will be relicensed as part of Qt, then SchemeHandler support also for older S60/Symbian releases can be enabled. If this happens it will be separate commit. Task-number: QTBUG-15282 Reviewed-by: Miikka Heikkinen
| | | * Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.Janne Anttila2010-11-151-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flags used to be Q_WS_S60 flags but as part of fabf804b they were changed to Q_OS_SYMBIAN. However since the whole while is only included to build when Q_OS_SYMBIAN is defined, the flags can be removed. Reviewed-by: mread
| | * | Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| | |/
* | | Moving QCoreTextFontEngine with related classes into own fileJørgen Lind2010-10-281-0/+2
|/ / | | | | | | | | | | The declaration of QCoreTextFontEngine was ifdefed in qfontengine_p.h. So was QMacFontEngine. I have moved them into their own files (qfontengine_coretext_p.h and qfontengine_mac_p.h).
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-262-7/+14
|\ \ | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * \ Merge commit '9f766c977a329c84023a15fc66f52d26ff03447b^' into qt-master-from-4.7Olivier Goffart2010-10-252-6/+13
| |\ \ | | |/
| | * QCompleter: do not auto complete when directory is changed.Olivier Goffart2010-10-132-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed regression for QCompleter associated with a QFileSystemModel. It would popup a popup each time the directory is changed. This was a regression in Qt 4.7.0, introduced with 319b0262418d74cc416a7d Task-number: QTBUG-14292 Reviewed-by: Thierry
| * | Make QCompleter return current parent instead of invalid indexZeno Albisser2010-10-201-1/+1
| |/ | | | | | | | | | | | | | | | | | | This fixes the issue of showing drive D: when completion is used in QFileDialog to display suggestions for folders to change into in path C:/. Task-number: QTBUG-14072 Reviewed-by: Olivier Goffart
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-133-7/+8
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h src/corelib/tools/qsimd.cpp
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-072-7/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-032-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Added missing code to bring web browser foreground in Symbian.Janne Anttila2010-09-031-0/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-8336 Reviewed-by: Miikka Heikkinen
* | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-191-0/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/opengl/qgl_p.h
| * | Fix compilation: QT_NO_LINEEDITTasuku Suzuki2010-08-161-0/+2
| | | | | | | | | | | | | | | Merge-request: 774 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-032-5/+11
|\ \ \ | |/ / | | | | | | | | | Conflicts: configure
| * | QDesktopServices crashes when accessing the NULL X11 variableHurewitz Kevin2010-08-021-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that QDesktopServices for X11 assumes that it will be used with a GUI application and may access the X11 variable. The X11 variable will be NULL if it has not been initialized by the QApplication initialization. Merge-request: 2442 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | QFileDialog : Fix completer showing up on the MyComputer view.Alexis Menard2010-07-151-1/+3
| | | | | | | | | | | | | | | | | | Only complete if there is a text to complete Reviewed-by:janarve
* | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-142-10/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/gui/image/image.pri src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp
| * | Avkon removal configured with -no-s60mread2010-07-012-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avkon dependencies can be configured out with the -no-s60 configure flag, conversely Qt on Symbian will use Avkon if -s60 is configured. These changes are intended to keep or introduce binary compatibility between the s60 and no-s60 configurations. To do this, it has been necessary to introduce stub equivalents of the CAknAppUi related classes into the no-s60 configuration, and override all Avkon framework virtual functions in the QS60Main... classes. Other than that, these changes are mostly just correcting the use of the Q_WS_S60 flag so that it only refers to Avkon dependencies. Reviewed-by: Sami Merila
* | | Adding -qpa configure switchJørgen Lind2010-06-241-2/+2
| | | | | | | | | | | | also renaming the embedded_lite qmake switch to be qpa
* | | Say hello to Q_WS_QPA!Jørgen Lind2010-06-241-1/+1
| | | | | | | | | | | | Rename Q_WS_LITE -> Q_WS_QPA
* | | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-189-172/+441
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/qws.conf src/corelib/io/qresource.cpp src/gui/image/qpixmapdata_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/opengl/qgl_p.h src/plugins/mediaservices/gstreamer/gstreamer.pro
| * | Fix QSystemTrayIcon::supportsMessages() on Windowsminiak2010-06-117-22/+31
| | | | | | | | | | | | | | | | | | | | | | | | Add QSystemTrayIconPrivate::supportsMessages_sys() method Report support for balloon messages only when they are actually allowed ("EnableBalloonTips" registry value) Merge-request: 2355 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * | Use NIM_SETVERSION to get the latest behaviorminiak2010-06-111-16/+71
| | | | | | | | | | | | | | | Merge-request: 2355 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * | Cleanup obsolete stuffminiak2010-06-112-58/+4
| | | | | | | | | | | | | | | Merge-request: 2355 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-191-7/+12
| |\ \ | | |/
| | * Doc: fix typoOlivier Goffart2010-05-171-1/+1
| | |
| | * QCompleter: fix misuse of QMap that can lead to crashesOlivier Goffart2010-05-171-6/+11
| | | | | | | | | | | | | | | | | | Patch providedin the task. Task-number: QTBUG-8407
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-173-54/+300
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| | * QSystemTrayIcon: put WinCE specific code into qsystemtrayicon_wince.cppJoerg Bornemann2010-05-073-54/+303
| | | | | | | | | | | | | | | | | | | | | | | | The desktop Windows and Windows CE code paths diverged too much. Splitting it up now and making it work on WinCE again. Task-number: QTBUG-4828 Reviewed-by: mauricek
| * | Make QCompleter cope with restricted screen real estate (mobile devices)Dominik Holland2010-05-061-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Always prefer the bottom area for the list popup - if that doesn't work out use the maximum available space (top or bottom) and resize the popup if it still does not fit. RevBy: Dominik Holland RevBy: ogoffart
| * | Ensure that the Mac specific Qt classes are namespacedAndy Shaw2010-05-041-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | When configuring Qt to be in a namespace then the Mac specific Qt classes should be namespaced as well to prevent any duplicated class names when a non namespaced version of Qt is used in conjunction. Reviewed-by: Richard