summaryrefslogtreecommitdiffstats
path: root/src/gui/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-182-15/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) Use s/static/Q_GLOBAL_STATIC/g in QScroller Alternative fix to the strict-aliasing violation warnings Revert "Fix strict-alias breaking warnings with GCC." Fix warning about vSize not being used in this function Do not try to test UnixFDs with the system API because it may be too old L10n: German translations for Qt 4.8 Compile with namespace support. Replace the handcoded math and change the timer buckets again. Move the constants up, preparing for refactoring Fix strict-alias breaking warnings with GCC. Fix compilation if D-Bus 1.4 isn't present. Change the number of entries in the first timer bucket. Change the error message in the timer ID deallocator. Add a benchmark for testing our QtDBus type-validation Move the QDBusPerformance test to the tests/benchmark dir Use the Qt code for validating types in QtDBus Add routines to validate D-Bus signature in QtDBus Remove the unused QDBusUnixFileDescriptor::isShared function Doc: document the QDBusUnixFileDescriptor class Autotest: really ensure that two fds are equal ...
| * Use s/static/Q_GLOBAL_STATIC/g in QScrollerRobert Griebl2011-04-182-15/+13
| | | | | | | | Reviewed-by: Harald Fernengel
* | Compile with QStringBuilder and QByteArrayOlivier Goffart2011-04-011-1/+1
|/ | | | Reviewed-by: Denis
* Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-221-2/+4
|\ | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp
| * Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1710-9/+10
| |\ | | | | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * | Fix 7ea1dd46966ae7cfa07fa18c001704e3c981b669 for Mac desktop builds.con2011-03-071-2/+3
| | | | | | | | | | | | | | | | | | | | | Cocoa.h can't be included after qscroller_p.h, but we need to have Q_WS_MAC defined before the ifdef. Reviewed-by: Morten Johan Sørvig
| * | Move Mac specific include into Q_WS_MAC scope for QScroller abstractioncon2011-02-071-1/+2
| | | | | | | | | | | | Reviewed-by: jorgen
* | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-214-6/+86
| |/ |/| | | | | | | Merge-request: 1132 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge earth-team into masterOlivier Goffart2011-03-151-0/+1
|\ \
| * | Windows: Activate the context menu on tray icons when shown.Martin Petersson2011-03-101-0/+1
| |/ | | | | | | | | Task-number: QTBUG-14807 Reviewed-by: Markus Goetz
* | Update copyright year to 2011.Rohan McGovern2011-03-109-9/+9
|/ | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* Fixed spelling.Robert Griebl2011-01-241-1/+1
| | | | Reviewed-by: TrustMe
* Use qreal everywhere to avoid double/float errors on embedded platforms.Robert Griebl2011-01-241-9/+9
| | | | Reviewed-by: Ralf Engels
* Fixed overshooting with a very low start velocity.Robert Griebl2011-01-242-71/+87
| | | | | | | | | | | Before this patch, the slow down (overshoot) was a separate scroll segment. This could lead to an actual acceleration when going into overshoot with a very low velocity. The new approach is to just continue with the normal scroll segment, until the max overshoot distance is reached and only add one additional segment for the bounce-back animation to complete the overshoot animation. Reviewed-by: Ralf Engels
* 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
generated by cgit v0.12 at 2025-01-21 01:51:52 (GMT)