summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactor soft keys implementation.Jason Barron2009-09-2121-355/+401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alessandro Portale Squashed commit of the following: commit dae5eda6996d48c12c4a5efd3f6042eb293bacbf Author: Jason Barron <jbarron@trolltech.com> Date: Fri Sep 18 10:32:26 2009 +0200 Only update soft keys when KEYPAD_NAVIGATION is enabled. For 4.6, let's just call these functions when keypad navigation is defined to minimize the impact on other platforms. They should probably get thier own define some day. commit 30a730553531f0f138de5eddb30413936a34fa36 Author: Jason Barron <jbarron@trolltech.com> Date: Fri Sep 18 10:30:23 2009 +0200 Add/remove the menu bar action when menu bar is added/removed. commit a83343a2870b34c228c8bc5e6274607b0e97baf6 Author: Jason Barron <jbarron@trolltech.com> Date: Fri Sep 18 10:28:55 2009 +0200 Compile fix for other platforms commit 39c9e3a0a1d3d62bf6ebd3212cfd2a81b86b9b2a Author: Jason Barron <jbarron@trolltech.com> Date: Thu Sep 17 21:37:59 2009 +0200 Fix 'softkeys' example after API re-factoring. Clean up this example and use the simplified soft key API. Now the actions are only allocated in the constructor and dynamically updated by calling addAction and removeAction. commit 314e45c33f40552db74e61755c2a3b0f8c77a41a Author: Jason Barron <jbarron@trolltech.com> Date: Thu Sep 17 21:30:32 2009 +0200 Re-factor and simplify the soft keys API. Several things here: - Move all the logic into QSoftKeyManager - Move the files into 'kernel' since it is not a widget - Remove QWidget::setSoftKey*(). Use addAction/removeAction instead - Made soft keys update on focus, window activation, and action changes. - Fixed several memory leaks where QAction's were created too often - QAction ownership pushed out to widget's - Added Select/Cancel soft keys for comboboxes and menus to be more consistent to platform look-and-feel. commit fb4c240d970262e9872dc5737df6808879143c75 Author: Jason Barron <jbarron@trolltech.com> Date: Mon Sep 7 15:49:31 2009 +0200 Merge the Symbian implementation with the other platforms nativeMenuBar It seems this has been refactored to share more code across the various platforms that support native menubars so the Symbian code can be mostly removed. commit aa55e4bcd1f009ab35c9519e18aa325fd212dd23 Author: Jason Barron <jbarron@trolltech.com> Date: Wed Aug 26 17:00:34 2009 +0200 Change filenames and move softkey stuff from 'widgets' to 'kernel'. This thing isn't a widget and therefore should not be in the 'widgets' subdirectory of gui. Also rename the files in preparation for refactoring and extending.
* Fix one QDialog auto test case where due to changed S60 positioning rules,Sami Merilä2009-09-211-1/+22
| | | | case failed.
* S60 native looking dialog support.Sami Merilä2009-09-2110-26/+535
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to QTSSIXTY-63 "Make Qt dialogs look native" S60 dialog support: * Positioning according S60 rules: - in portrait dialogs at the bottom of the screen, - in landscape positioned in the center of the screen [unless device supports bottom softkeys], so that softkeys are not covered by the dialog * If dialog shows extension, then dialog is re-positioned * Dialog size: - in portrait screen wide dialog, height can change - in landscape width is the same size as width in portrait (some dialogs are maximized) * No push buttons or DialogButtonBoxes in internal qt dialogs (QWizard, QInputDialog, QFileDialog, QFontDialog, QColorDialog, QProgressDialog, QErrorMessage, QMessageBox), instead signals are remapped to softkeys. * Globally, dialogbuttonboxes are converted automatically to softkeys. OPEN: * Needs to be re-factored slightly after softkey API refactoring is finished. BUGS: QWizard layout switch is wonky - dialog is not re-sized correctly. QFontDialog will not fit into device screen (too much widgets in it). Some effort needed to be make it smaller. Cannot set one softkey at the time softkeys => Options menu and right softkey cannot be set separately [SoftKey re-factoring will help] Dialogs cannot get touch events to softkeys [SoftKey re-factoring will help] Reviewed-by: Alessandro Portale Reviewed-by: Jason Barron Reviewed-by: mread Reviewed-by: Shane Kearns
* Fix bug in the invisibleStretchLastSection autotest.Jan-Arve Sæther2009-09-211-15/+15
| | | | | | | Reduce the count so that it can fit on one screen. Also make sure we call setStretchLastSection after the resize, since setStretchLastSection depends on the size of the view.
* Performance: reduce overhead of updateMatrix() in GL2 paint engineRhys Weatherley2009-09-211-32/+45
| | | | | | | | | | | The original code was performing 40 floating-point multiplications, 40 additions, and 2 divisions every time the matrix was changed. Because most of the components in the orthographic projection matrix are trivial, we can implement the same transformation with only 6 multiplications, 6 additions, and 2 divisions. Reviewed-by: Sarah Smith
* Make OpenGL overpainting example compile under OpenGL/ES 1.1Rhys Weatherley2009-09-212-5/+12
| | | | Reviewed-by: trustme
* Add missing license headerRhys Weatherley2009-09-211-0/+41
|
* Increase precision when normalizing vectorsRhys Weatherley2009-09-214-8/+34
| | | | | | | | | QVector3D::normalize() and other similar functions were losing precision when qreal was float, causing vectors with small lengths to normalize to (0, 0, 0). Do the length calculations with double precision to avoid this problem. Reviewed-by: Sarah Smith
* remove display lists and qt3d-ize overpainting/hellogl exampleSarah Smith2009-09-2110-252/+624
| | | | | | | | On the way to making opengl examples portable, remove display lists and go to triangles only. Use QMatrix4x4. While on the job use Qt/3D stylee to make the QtLogo as an example of 3D programming more Qt-like. Reviewed-by: Rhys Weatherley
* Accelerate drawRoundedRect() for the OpenVG paint engineRhys Weatherley2009-09-203-4/+104
| | | | | | | | Previously rounded rectangles were converted into a QVectorPath and then a VGPath. This change creates the VGPath directly without an intermediate step and was made possible by change dd3e4308. Reviewed-by: trustme
* Making Keypad Navigation more usableAlessandro Portale2009-09-1913-28/+1493
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All changes of this commit are #ifdef'ed in QT_KEYPAD_NAVIGATION. Most desktop Qts won't notice any change. Navigating between QWidgets was not alwys a pleasure on keypad devices. This commit fixes the navigation behavior for some widgets, mostly itemviews. Furthermore, it adds a 'directional' navigation mode. Until now, the existing keypad navigation used the tab order do go back and forth between widgets. The new mode is supposed to provide a more intuitive navigation. It is the new default mode on Symbian. Screens (and their resolutions) become bigger, and also low resolution screens can be used in landscape mode. That's why the directional mode was requested. Another popular request was to put some more convenience into QSlider: If a (horizontal) slider has focus and the user presses left/right, the value of the slider may directing change without being selected (edit mode). This commit also adds the manual test 'keypadnavigation'. Reviewed-by: Shane Kearns
* Doc: Resized the gestures (multitouch) image on the examples page.David Boddie2009-09-182-1/+1
| | | | Reviewed-by: Trust Me
* A pen/brush can be invalid and have a valid colorAnders Bakken2009-09-181-8/+12
| | | | | | | | | | | | | This code is wrong: if (brush != Qt::NoBrush) ... It should be: if (brush.style() != Qt::NoBrush) ... Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Implement QDirectFBPaintEngine::drawRoundedRectAnders Bakken2009-09-183-2/+11
| | | | | | We need to lock before falling back to QRasterPaintEngine Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Remove 3rdparty/javascriptcore unused .pro file that produce errors duringJocelyn Turcotte2009-09-181-73/+0
| | | | | | configure Reviewed-by: Simon Hausmann
* Small improvements to some autotests.Denis Dzyubenko2009-09-183-128/+54
| | | | | | | This should improve qgraphicsview, qgraphicsitem and qtableview autotests on slow window managers on X11. Reviewed-by: trustme
* Corrected some license headers.Kim Motoyoshi Kalland2009-09-183-11/+100
| | | | Reviewed-by: Samuel
* Windows CE specific time functions removed from QtWebKitJoerg Bornemann2009-09-186-698/+2
| | | | | | | | The files were moved to src/3rdparty/ce-compat That also means, that we don't need special includes in QtWebKit anymore. Reviewed-by: Simon Hausmann
* make tests/auto/qicon/qicon.pro work in shadow buildsJoerg Bornemann2009-09-181-5/+7
| | | | Reviewed-by: TrustMe
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Liang QI2009-09-188-121/+70
|\
| * Doc: Added missing qdoc macros.David Boddie2009-09-181-0/+5
| | | | | | | | Reviewed-by: Trust Me
| * Doc: First update of the documentation about learning Qt.David Boddie2009-09-183-22/+42
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Prevented the inclusion of a license header in the documentation.David Boddie2009-09-182-1/+3
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Language and style fixes to the XML Patterns documentation.David Boddie2009-09-182-98/+20
| | | | | | | | Reviewed-by: Trust Me
* | Switch glyph cache from Qt to SymbianLiang QI2009-09-183-3/+49
|/ | | | | | | Use Symbian glyph cache directly in QRasterPaintEngine, do not need cache them in Qt if on Symbian Platform. Reviewed-by: Alessandro Portale Reviewed-by: Jason Barron
* Allow forcing an empty window title.Denis Dzyubenko2009-09-181-1/+1
| | | | | | | | | | | | | When a user sets a window title on a window to an empty string we will not check if the value was an empty string before. This handles a special case on X11 and Windows when we set the window title to the application executable name by default if the user didn't provide the title, so if the user explicitely wants to remove the windowtitle completely and make it empty, he will be able to set it to an empty string. Reviewed-by: Olivier Goffart Reviewed-by: Prasanth Ullattil
* initialize the this-register of the global contextKent Hansen2009-09-181-0/+1
| | | | | | | | | | | QScriptEnginePrivate::thisForContext() relies on the this-register of the global context to contain an invalid JSValue. The default Register constructor (used to initialize the registers of the global context) only invalidates its value when NDEBUG is not defined (but we define it). Therefore, we must explicitly set the this-register to an invalid value. Reviewed-by: Olivier Goffart
* put the this-register calculation into a functionKent Hansen2009-09-183-3/+10
| | | | | | Avoid copy and paste. Reviewed-by: Olivier Goffart
* QtWebKit Windows CE compile fixJoerg Bornemann2009-09-182-0/+8
| | | | | | | | | There is no _aligned_alloc or _aligned_free on Windows CE. We just use the Windows code that was there before and use VirtualAlloc. But that also means that the BLOCK_SIZE must be 64K as this function allocates on 64K boundaries. Reviewed-by: Simon Hausmann
* QtWebKit Windows CE compile fixesJoerg Bornemann2009-09-185-6/+8
| | | | Reviewed-by: Simon Hausmann
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-182-2/+18
|\
| * Application crashes when a menu is inserted twice on a menubar (Cocoa).Prasanth Ullattil2009-09-182-2/+18
| | | | | | | | | | | | | | | | | | Cocoa does not allow NSMenu to have multiple supermenu's. If a menu is added again as submenu, Qt will now disable the menu item or the menu will not be added at all if it is added again to the menubar. Task-number: 258822 Reviewed-by: MortenS
| * Fix broken .ui file - class name was not specified correctly.Rhys Weatherley2009-09-181-1/+1
| | | | | | | | Reviewed-by: trustme
* | Fixed broken scrolling of cached graphics items on X11.Samuel Rødal2009-09-181-41/+1
| | | | | | | | | | | | | | | | | | | | | | The scrolling was broken in other graphics systems than the native, since _q_scrollPixmap assumed that all QPixmaps were using the X11 backend. We can just use QPixmap::scroll instead, which should also make it faster with the raster paint engine than creating a temporary painter and doing a blit. Also, _q_scrollPixmap would do blending instead of blitting for non-opaque pixmaps. Reviewed-by: Olivier Goffart
* | Fixed passing a zero drawable to X11 api causing X errors.Denis Dzyubenko2009-09-181-4/+9
| | | | | | | | | | | | | | In the windowsurface we shouldn't create a backingstore pixmap if the window has invalid size. Reviewed-by: Samuel
* | Improved a qt_x11_wait_for_window_manager.Denis Dzyubenko2009-09-181-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to waiting until the window manager maps and reparents the window, also wait until we get initial expose event. The window manager will most probably send us several ConfigureNotify events, so wait until all of them are handled in addition to the Expose event (as one might rely on another). Also, we shouldn't wait for the ReparentNotify event if the window has X11BypassWindowManagerHint. Reviewed-by: Olivier Goffart
* | More robust implementation of qt_x11_wait_for_window_managerOlivier Goffart2009-09-181-4/+9
| | | | | | | | | | | | | | Make sure we recieve both ReparentNotify and MapNotify events. Also change the timeout to 2 seconds to cope with slow machines Reviewed-by: Denis
* | Added a QTest::qWaitForWindowShown function that waits for window manager on ↵Denis Dzyubenko2009-09-183-0/+34
| | | | | | | | | | | | | | | | | | | | X11. On X11 it calls the qt_x11_wait_for_window_manager from QtGui, allowing to wait until the window has been mapped and reparented into a frame decoration parent. Reviewed-by: Olivier Goffart
* | Added missing headers to the testlib.proDenis Dzyubenko2009-09-181-11/+21
| | | | | | | | | | | | This allows them to appear in creator. Reviewed-by: trustme
* | Fix symbol clashes between QtWebKit and QtScriptSimon Hausmann2009-09-181-0/+1
| | | | | | | | | | | | Rename the JSC namespace to QTJSC. Reviewed-by: Lars Knoll
* | Fix compilation and remove trailing whitespace.Jason Barron2009-09-181-140/+140
| | | | | | | | | | | | Fix compilation on systems that support the extended bitmap format. Reviewed-by: Jani Hautakangas
* | System locale on Mac may not return AnyCountry for any language != Ccon2009-09-181-2/+5
| | | | | | | | | | | | Because of QLocale limitations this broke other places. Reviewed-by: Denis Dzyubenko
* | Adding support for symbian graphics resources.Aleksandar Sasha Babic2009-09-1812-6/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to convert from and to new Symbian type of graphics resource, namely SgImage. This only supported with the OpenVG graphics system. On other graphics systems this will return null QPixmap. Conflicts: src/corelib/global/qglobal.h src/gui/image/qpixmap.h src/gui/image/qpixmap_s60.cpp Reviewed-by: Jason Barron
* | Add debug outputPaul Olav Tvete2009-09-181-0/+7
| | | | | | | | | | | | | | | | This test mysteriously fails when run from the autotest system, but succeeds when run manually. We need more data to find out what is going on. Sort-of-reviewed-by: Jesper
* | Remove remaining support for win32-mwc mkspecIain2009-09-184-277/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.6 cannot be used with the win32-mwc makespec, as the Metrowerks compiler supplied with Symbian/S60 releases does not contain enough support to build the Qt host tools in a Unicode version, and ANSI support has been removed in 4.6. Alternative mkspecs are win32-g++, requiring mingw tools to be installed, or one of the win32-msvc.... mkspecs, requiring MS Visual Studio (Express edition is fine) The mwc makefile for qmake was already removed, so this just removes the remaining support. Reviewed-by: Jason Barron
* | Workaround for problems interworking RVCT-built s60main with GCCE appsIain2009-09-182-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for the fact that removing --export_all_vtbl from the RVCT command line seems to cause problems when linking the static s60main lib with apps built with GCCE (at least 4.3, haven't tested earlier versions) The root cause still needs to be found and fixed, after which this workaround can hopefully be removed. Problem observed on Symbian^3 release, RVCT 2.2 build 686, GCC-E 2009q1-162 release from CodeSourcery. Reviewed-by: axis
* | Fixed bug in GL pixmap backend (causing missing rendering in lance).Samuel Rødal2009-09-181-1/+5
| | | | | | | | | | | | | | Since copyBackFromRenderFbo() manually changes the framebuffer object binding, we also need to update the context's current_fbo member. Reviewed-by: Kim
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-181-31/+31
|\ \
| * | Change name of test to tst_QGraphicsAnchorLayout1Jan-Arve Sæther2009-09-181-31/+31
| | |
* | | Introduce native Symbian bitmap support to QPixmapJani Hautakangas2009-09-1819-256/+1123
|/ / | | | | | | | | | | | | | | | | This is done to reduce heap consumption and to give a possibility to share bitmaps across process. QPixmap maps to Symbian CFbsBitmap which is stored in Symbian font and bitmap server. Reviewed-by: Jason Barron