summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* id-based: use source strings instead of empty translations only for ↵Oswald Buddenhagen2009-10-222-3/+5
| | | | unfinished messages
* actually guess the target language from the file nameOswald Buddenhagen2009-10-221-0/+2
| | | | --help says it does, but it didn't really.
* QDom autotests: make test fail instead of time outPeter Hartmann2009-10-221-0/+1
| | | | | | introduce a QFAIL for now until problem is fixed Reviewed-by: Carlos Duclos
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Friedemann Kleint2009-10-2241-138/+1581
|\
| * Fix a bug in QGraphicsRotation related to 2D projectionsRhys Weatherley2009-10-223-3/+5
| | | | | | | | | | | | | | The projection to 2D needs to be done when the rotation is applied, not after all transformations have been applied. Reviewed-by: trustme
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-22136-31352/+57141
| |\ | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache.cpp
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-2236-30168/+54717
| | |\
| | | * Merge branch '4.5' into 4.6Thiago Macieira2009-10-213-3/+86
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/widgets/qmenu_mac.mm tests/benchmarks/benchmarks.pro tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp
| | | | * tst_qsslsocket: new bigChunk testcaseMarkus Goetz2009-10-201-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new test is to find out if the BIO size of OpenSSL is limited or not. The test passes on my Linux, however the OpenSSL docu suggests that the BIO size is limited. From http://www.openssl.org/docs/crypto/BIO_s_bio.html "This is currently 17K". Reviewed-by: Peter Hartmann
| | | | * make missing Key_Back and Key_Forward menu glyphs return 0 on mac(cocoa)Dean Dettman2009-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an addition to commit 5651d2547261ccecbf50f8141c634f59c0adc00d to make it obvious that in cocoa nothing is returned. Task-number: QTBUG-4873 Reviewed-by: MortenS
| | | | * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.5Dean Dettman2009-10-2014-159/+166
| | | | |\
| | | | | * Add a up/down benchmark to benchmarks/qnetworkreplyMarkus Goetz2009-10-201-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | | | | * Backport benchmarks/qnetworkreply to 4.5Markus Goetz2009-10-203-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * | Adds Key_Back and Key_Forward menu glyphs on mac(carbon)Dean Dettman2009-10-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change improves the behavior of QMenu when Key_Back and Key_Forward are used as shortcuts. A dotted arrow appears on carbon, and on Cocoa the image is blank, instead of undefined as it was before. Task-number: QTBUG-4873 Reviewed-by: msorvig
| | | * | | Rename the .cpp for QNetworkReply benchmark testsThiago Macieira2009-10-212-1/+1
| | | | | |
| | * | | | Fixed clock() function return values in audio class's.Kurt Korbatits2009-10-226-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clock() function should return microseconds, fixed example, alsa backend and win32 backend. Reviewed-by:Justin McPherson
| * | | | | Properly detect font smoothing setting on Mac OS X in raster engineEskil Abrahamsen Blomfeldt2009-10-213-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would assume font smoothing on the mac was always turned on, giving poor text rendering in the cases where it was not. This implementation mirrors querying the cleartype setting on Windows, checking the setting on application initialization and rendering into an 8 bit cache if it is turned off. Task-number: QTBUG-4881 Reviewed-by: Morten Johan Sørvig
| * | | | | Fixed an assert when running the composition demo on Mac.Trond Kjernåsen2009-10-201-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't create a QGLWidget in the QGLEngineSelector, since it may be called before a QApplication object has been constructed. Reviewed-by: Kim
| * | | | | Make sure QGLTextureCache exists when creating surfaces for pixmapsTom Cooksey2009-10-202-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLTextureCache installs pixmap cleanup hooks which are used to clean up the EGL surfaces. Reviewed-By: Trustme
| * | | | | Add a new window surface which utilises QX11GLPixmapDataTom Cooksey2009-10-205-4/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new surface uses XCopyArea to post updates to the window and thus, supports partial updates.
| * | | | | Fixed the SVG paint engine to preserve whitespace when drawing text.Kim Motoyoshi Kalland2009-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added xml:space="preserve" to the output text tag. This attribute tells the SVG user agent not to strip away excess whitespace in the text element. Reviewed-by: Trond
| * | | | | Fixed a stencil clearing bug in the GL 1 engine.Trond Kjernaasen2009-10-201-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the system clip changed the stencil buffer wasn't necessarily updated correctly. Use a region to keep track of the dirty areas in the stencil buffer, like we do in the GL 2 engine. Reviewed-by: Samuel
| * | | | | Fix build on desktop X11Tom Cooksey2009-10-202-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Hash-Define out X11GL pixmap data until the GLX implementation is ready.
| * | | | | Use different GL contexts for ARGB & RGB pixmapsTom Cooksey2009-10-191-31/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 16 bpp systems, RGB pixmaps are 16-bit whereas ARGB pixmaps are 32-bit. This means two different EGL configs are used which are incompatable with each other. As a result, we have to use 2 different EGL contexts - one for each config. Reviewed-By: Trustme
| * | | | | Add an assert testing the cleanup hooks exist before executing themTom Cooksey2009-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | | | Add a new QX11GLPixmapData which renders to X pixmaps using GLTom Cooksey2009-10-199-5/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable it by setting QT_USE_X11GL_PIXMAPS environment variable while using the -graphicssystem opengl
| * | | | | Separate modification & destruction pixmap cleanup hooksTom Cooksey2009-10-195-19/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the QExplicitlySharedDataPointer change, the ref-count was 0 when calling the cleanup hooks from ~QPixmap. That enabled the hook to figure out if the pixmap is being modified or deleted. As the ref count is now 1 when calling the cleanup hooks in ~QPixmap, we need to seperate the hooks. This change should make using textre-from-pixmap faster as the EGL/glX surface wont get re-created everytime the pixmap is modified. Reviewed-By: Gunnar
| * | | | | Stop QEglContext destroying contexts it doesn't ownTom Cooksey2009-10-192-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Rhys Weatherley
| * | | | | Integrated new triangulating stroker into QtGunnar Sletta2009-10-195-54/+730
| | | | | |
| * | | | | Fixed slow QPixmap::fill() when the pixmap is sharing data.Kim Motoyoshi Kalland2009-10-191-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the pixmap is sharing data with other pixmaps, it must be detached before it is filled. Instead of detaching by making a copy, create a new uninitialized data object since all pixels are overwritten by fill() anyway. Task-number: QTBUG-3228 Reviewed-by: Trond
* | | | | | Documentation: Correct dangling reference to Qt Designer documentation.Friedemann Kleint2009-10-221-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | Task-number: QTBUG-4605
* | | | | windowsmobilelify embedded demosJoerg Bornemann2009-10-214-9/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: aportale
* | | | | Listen on hasVideoChanged() instead of only checking hasVideo().Frans Englich2009-10-212-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that when the backend's knowledge about the content's video capability changes outside the LoadingState, it still work. This apparently matters for the Helix backend. Patch supplied by Adookkattil Saleem (Nokia-D/Dallas). Reviewed-by: Gareth Stockwell Reviewed-by: Frans Englich
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Gareth Stockwell2009-10-211-6/+8
|\ \ \ \ \
| * | | | | Assistant: More useful error messages for help collections.ck2009-10-211-6/+8
| | | | | |
* | | | | | Fixed logical error in winIdChanged auto test.Gareth Stockwell2009-10-211-0/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test (see 02fbfdbd) previously asserted that changing the parent of a native widget caused a WinIdChange event on Symbian, but not on other platforms. The test now asserts that: 1. Changing the parent of a native widget causes a WinIdChange event on all platforms. 2. Changing the grandparent of a native widget causes a WinIdChange event only on Symbian. Reviewed-by: Paul Olav Tvete
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Iain2009-10-2193-31270/+56640
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtMultimediau.def src/s60installs/eabi/QtNetworku.def
| * | | | | Make Symbian emulator behave the same as device for mouse & touchscreenShane Kearns2009-10-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emulator HAL reports that it supports mouse but not touch. Since Qt is changing behaviour based on these values, the emulator works differently from the device. To workaround, the emulator HAL values are ignored and following used: 5.0: mouse 0, touch 1 3.x: mouse 0, touch 0 The mouse can still be used to interact with the emulator, as pointer events are still delivered. Task-number: QTBUG-4803 Task-number: QTBUG-4616 Reviewed-by: Sami Merila
| * | | | | Cleaned up the API of the Symbian event hooks.axis2009-10-2112-76/+361
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two major points were: - Replacing "s60" with "symbian" in all event handling functions, since there is nothing S60-specific about them. - Replace the Symbian event types with the encapsulating QSymbianEvent container. This allows us to cope with more types of events in the future without having to add new virtual functions. AutoTest: QWidget passed Task: QT-1156 RevBy: Jason Barron RevBy: Shane Kearns RevBy: Sami Merila
| * | | | | fix editable comboboxes in the Windows mobile styleJoerg Bornemann2009-10-211-31/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In editable QComboBoxes we used cutting-edge technology to display the text. But that's not always wanted. We actually want to see all pixels of a string like "why oh why". The lower edge was cut off. Reviewed-by: thartman
| * | | | | Revert "Switch from *-armv5 to *-armv6."Frans Englich2009-10-218-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a6af1538ea53408399fb29870a4ef16a92c7893a. armv6 is not supported by public SDKs, due to armv6/urel not existing. Such SDKs needs to be fixed by copying the armv5 files. Hence we revert, and postpone until we have SDKs which actually support armv6, and until we have a stronger insight into what advantages armv6 brings.
| * | | | | don't remap VK_RETURN on Windows mobile if not in keypad navigation modeJoerg Bornemann2009-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | Fixed .make.cache write collision on symbian-sbsv2 buildsMiikka Heikkinen2009-10-211-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a project was built for more than one target with single sbs command, .make.cache generation could sometime fail because multiple jobs attempted to write into it simultaneously. Now only one of the specified targets will be used to generate .make.cache, making collisions impossible. Reviewed-by: Janne Anttila
| * | | | | S60Style's tab widget is too small for touch useSami Merilä2009-10-214-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TabWidget for S60Style is too small for touch use, it is rather hard to accurately touch the tabpane to switch the active tab. To fix this, we ask the native tabpane height from AVKON and set the QTabWiget's pane height to native height (or bigger). Task-number: QTBUG-4243 Reviewed-by: Alessandro Portale
| * | | | | Switch from *-armv5 to *-armv6.Frans Englich2009-10-218-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change from armv5 to armv6 by default. This updates documentation, the convenience scripts, and the Raptor/abld qmake generator to use armv6 instead. Task-number: QTBUG-4891 Reviewed-by: Jason Barron
| * | | | | Included table for definition of plural forms for different languages.Peter Yard2009-10-211-3/+334
| | | | | |
| * | | | | VXWorks changes.Bill King2009-10-211-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | Forward port the vxworks changes from d7b688870aead912690188b324d370b920a7a600
| * | | | | Fixes: WebKit Windows CE buildBill King2009-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Details: Details: Make localtime a static function. This is needed for linking sqlite3.lib into webkit and it generally makes sense for our build of sqlite using the amalgamated build. (cherry picked from commit 5e326c74239eecbd3e64df90ebbafaf51530d43d)
| * | | | | Trolltech modifications to SQLite.Bill King2009-10-211-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Include <qconfig.h> and rely on Qt's QT_NO_THREAD instdead of SQLite's THREADSAFE to toggle source code releated to threading in SQLite. * compilation for Windows CE 6 While for WinCE 5 localtime is declared but not defined in the libraries, for CE 6 they are not even declared. That usually makes sense but sqlite relies on it being present in time.h. As sqlite defines their own localtime for Windows CE, we "only" need to forward declare it earlier. Conflicts: src/3rdparty/sqlite/sqlite3.c
| * | | | | Update sqlite to 3.6.19Bill King2009-10-212-30056/+53754
| | |/ / / | |/| | |