summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added some missing build instructions for abld.axis2009-11-252-0/+11
| | | | | | | WebKit will not build unless the mentioned variable is set. RevBy: Aleksandar Sasha Babic (cherry picked from commit 4817debee23a72f44eedbb8f33b6b611b5161174)
* Compile fix for win32-icc.Jan-Arve Sæther2009-11-241-0/+12
| | | | | | | | | | The Intel Compiler inlined the destructor of QObjectPrivate too agressively, causing it to generate a call to ~QObjectData for QtGui. ~QObjectData is not exported from QtCore, so it failed linking. Task-number: QTBUG-5145 Reviewed-by: Alexis Menard (cherry picked from commit db5e4496229a776768464d1d3d2e1f8e81bd6ba0)
* Don't crash in eval() function when QtScript debugger is attachedKent Hansen2009-11-242-2/+36
| | | | | | | | | | | | | | | | | | | | | | The built-in eval() function bypasses the script registration performed by QScriptEngine::evaluate(), so if we get an atStatement() callback from JSC from that script, the scriptID-to-sourceProvider lookup will fail. In this case, just return from atStatement() without delivering the positionChange() callback to the QScriptEngineAgent, since the agent will not have received the scriptLoad() callback for that script anyway. This is a change in behavior from 4.5, but we consider it the minimum-impact fix at this point to keep 4.6.0 from crashing. The only downside is that debugging will effectively be "disabled" for the script passed to eval(), but that's a lot better than crashing. Task-number: QTBUG-6108 Reviewed-by: Jedrzej Nowacki (cherry picked from commit 23002374d11598b26b6585e78dc073071a13f0ec)
* WinCE: only use native menu bars for windows mobileninerider2009-11-231-0/+3
| | | | | | | | | On Windows CE the native menubar must not be used. The corresponding flag was never set for Windows CE. Task-number: QT-2530 Reviewed-by: Maurice (cherry picked from commit cda63c368dbb5acd040e2190db8f25de69462d8e)
* Revert check for file size to a warning in QFile::mapJoão Abecasis2009-11-231-1/+1
| | | | | | | | | | | | | The check, introduced in c66de8a19b558e14097c402480eeabf0b5ec2351, changes behavior and it is not clear whether we should prevent mmaping beyond EOF. FWIW, python prevents it. Leaving a warning in there for now so as not to break applications that depend on the feature. Task-number: QTBUG-6008 Reviewed-by: Thiago Macieira (cherry picked from commit 095c92f03e0c01b878eaa0cd1b7844171ce9241f)
* Fix regression introduced in 1e6b424b692b20dcfec920f8d3563e520ec1ff05João Abecasis2009-11-232-1/+117
| | | | | | | | | | | | | When processing the result of QIODevice::readLine, forgot to take into account that a '\0' is appended to the array. The terminating character is not accounted for in the number of bytes returned. By pre-allocating a byte for the terminating null character, we make sure we'll actually read 16k bytes on each and every iteration. Task-number: QTBUG-6019 Reviewed-by: Thiago Macieira (cherry picked from commit b7692016f282251002b3e85dfcb5567bd91a12c0)
* Fixed antialiasing in the GL based QGraphicsView demos under X11.Trond Kjernåsen2009-11-231-1/+6
| | | | | | | | | | | | | | | All the examples/demos that used a QGraphicsView with a QGLWidget as a viewport, that had multisampling enabled, was broken after 7b61fbf03e170a7da37d5f57ed4053aae719ec7f. This is because the reparented QGLWidget will be forced to use the parent widget's visual, which in this case does not contain any multisample buffers. The QX11Info structure for QGLWidget is put together based on the QGLFormat that is passed into the QGLWidget constructor and will in most cases always be different from the parent widget visual. Task-number: QTBUG-5998 and QTBUG-6003 Reviewed-by: Eskil (cherry picked from commit 5cf6f6276a3a9103876937c300c1adce157eebeb)
* Document known issue - window resizing slower on Windows 7 due to gestureVolker Hilsheimer2009-11-231-0/+5
| | | | | initialization process creating window handles. (cherry picked from commit b752acf1805eebd64e7e833862690e9ebdb714e3)
* doc: Added note about including a 3rd party library in the bundle.Martin Smith2009-11-231-1/+7
| | | | (cherry picked from commit 51b3c2e652578f5577c07c22e177699d345c1dd7)
* Incorrect DropAction returned by QDrag::exec() on Cocoa.Prasanth Ullattil2009-11-231-1/+1
| | | | | | | | | | | The action performed by the latest drag and drop operation is stored in the global DnDParams structure. The QDrag::exec() return value has to be fetcted from this global variable instead of the temporary copy on stack. Commit 0d231c32cc7670d356d486b13648cb5bd471ffef broke this. Task-number: QTBUG-6001 Reviewed-by: Denis (cherry picked from commit a222302ca45e33306dacae0aa16a572c13abc483)
* Q_ASSERT failure when resizing a span to (1,1) in 1st cellGabriel de Dietrich2009-11-232-1/+9
| | | | | | Reviewed-by: Olivier Task-number: QTBUG-6004 (cherry picked from commit 75d68b2b245da91ec9f985893f9b233d9d6a0793)
* Fix configure warning for non-symbian buildsJason McDonald2009-11-231-2/+4
| | | | | | | | | Configure complains about "Could not retrieve HKEY_LOCAL_MACHINE\Software\Symbian\EPOC SDKs setting". It should only try to do that for Symbian builds. Reviewed-by: Lincoln Ramsay (cherry picked from commit 7e7e3c3fe15780aa7d024e136acaf697ab49458c)
* Doc: Adding documentation on Embedded Hardware accelerationMorten Engvoldsen2009-11-235-144/+289
| | | | | | | | Added "best practice" page on HW acc for mebedded. Modified HW acc docs. Adding Hello GL ES for Wince to the list of examples. QTBUG-5791 David Boddie (cherry picked from commit fbbdf8698fb0444d5170b7d0a14e870ea789398f)
* fix crash on closing "rightmost" fileOswald Buddenhagen2009-11-231-2/+4
| | | | | | | "This cannot happen" ... yeah, right. :} Task-number: QTBUG-5989 (cherry picked from commit 7367a12c4a0d7686b9d35778e5de33a463504d75)
* Fixes regression in QListView: Selection would not expend to the full viewportOlivier Goffart2009-11-211-2/+6
| | | | | | | | | | Commit ecc202c introduced the regression while fixing another regression (QTBUG-5854) The selection would not expend to the whole viewport. Reviewed-by: Robert Griebl (cherry picked from commit 73153fa5288e22d27f26d0e1045e82698c9a6343)
* Use relative paths when invoking mifconv.Janne Anttila2009-11-201-1/+1
| | | | | | | | | | | | | Some S60 SDK has a bug which make mifconv to crash with absolute paths. Switched to use QMAKE_FILE_IN variable in mifconv.commands instead of using join of ICON keywords. Joining is not needed anymore since ICON keyword supports only one filename. Using input variable (QMAKE_FILE_IN) also esnures that absolute path is converted to relative before invoking mifconv. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen (cherry picked from commit 745db3d1b9a149910dcaa3c65aabab020eefa027)
* Unified ICON keyword handling for ABLD and SBSv2 toolchains.Janne Anttila2009-11-201-2/+3
| | | | | | | | | | | | | | | | | | With SBSv2 toolchain only first file from ICON keyword is used and it is actually the right behaviour. Originally support for multiple files in ICON keyword was introduced to support localized application icons. However, in that case the different localized icons should not go to same MIF file since it is not possible to define in .rss file which icon number should be used for which language. To support a localized application icons separate MIF for each locale should be created and installation of ICON should depend on selected language. Implementing proper support for localized icons is left for another task. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen (cherry picked from commit 6c6661041fa3dfe7a8915ee1d27443b2ced179de)
* Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-202-2/+2
| | | | | | | | | ICON keyword can be used without UID, since .mif filename is generated based on target instead of UID3 nowadays Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen (cherry picked from commit 05e956d5c7d5c39bee332972ce54fea71c15d24b)
* Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-203-9/+37
| | | | | | | | | | This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0. It can be reverted now since mifconv invoking is changed to use relative paths instead of absolute one. Task-number: QTBUG-4745 Reviewed-by: TrustMe (cherry picked from commit 4e4a800574a28a441858f95021d9092aa3001491)
* Changed MIF filename from UID to target name in Symbian.Janne Anttila2009-11-207-27/+42
| | | | | | | | | | | | | | | | This change makes it possible to define ICON keyword in pro file without UID3. It is safe to use target as an icon name since Symbian devices cannot have two different binaries with the same name as all binaries are located in \sys\bin. This means there cannot be also two mif files with same target name. Also all native S60 apps use target name as an MIF basename. Target name is also much easier to associate with app than UID. Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen (cherry picked from commit 952f0ca3f371b040bd8b8a007cdf87bf0e4843ad)
* Do not recreate the VGImage if the size is unchangedRhys Weatherley2009-11-202-33/+10
| | | | | | | | | | When a pixmap's contents change in QVGPixmapData, only recreate the VGImage in the GPU if the size is different than before. This should help reduce GPU memory fragmentation. Task-number: QT-2504 Reviewed-by: Sarah Smith (cherry picked from commit a8c8c2274d2d0a708786adbb357013955f99c0af)
* Remove unmatched else in non-EGL mode for OpenVG pixmap dataRhys Weatherley2009-11-201-1/+0
| | | | | Reviewed-by: Gunnar Sletta (cherry picked from commit 55b1f191d2ab97b2c1029f12e2315412e74a1dc2)
* Prevent a deep copy of QImage::bits() in the OpenVG pixmap implementationRhys Weatherley2009-11-201-2/+10
| | | | | | Task-number: QTBUG-5869 Reviewed-by: Sarah Smith (cherry picked from commit 73477789bdeeba851cf095cbdda5c36d9f5c31df)
* Add entry about behavior changes due to QtScript using JavaScriptCoreKent Hansen2009-11-201-0/+7
| | | | (cherry picked from commit 9590574158d0d976f66c9f7ca36f88b2f28d52b9)
* Autotest: Change the service name we're testing between tests.Thiago Macieira2009-11-201-5/+7
| | | | | | | | Otherwise, we get errors from one test to the next, due to the cleanup unregistering the name again. Task-number: QT-5588 (cherry picked from commit 65e00180516eb136c2a7119dfe9e63fc9c66065e)
* Remember to match the actual arguments too.Thiago Macieira2009-11-202-0/+20
| | | | (cherry picked from commit b1196d5733ae01660e4345a5bbecd9c1b32238a4)
* Disable the deprecation warning for this signal since we're using it nowThiago Macieira2009-11-201-5/+0
| | | | | Task-number: QTBUG-5972 (cherry picked from commit f01c631f84f9373b06d0572bfed7a4e8213a46a7)
* Revert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"Thiago Macieira2009-11-201-0/+3
| | | | | | | This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188. Task-number: QTBUG-5972 (cherry picked from commit db1cff73726ff12d50139769dc8071f9e9173261)
* updated configure.exe - should fix the Symbian and WinCE issuesEspen Riskedal2009-11-201-0/+0
| | | | Reviewed-by: Shane Kearns
* Update .qm files for releaseJason McDonald2009-11-2061-0/+1
| | | | Acked-by: Oswald Buddenhagen
* Revert "Doc: Added an example to demonstrate the QWebElement class."Jason McDonald2009-11-2011-300/+6
| | | | | | | | This reverts commit 19d63f4d932ae16d0e1c69892681ecd1fabeb44c. Conflicts: doc/src/qt4-intro.qdoc
* remove bogus doc paragraphs relating to codecForUtfText()Oswald Buddenhagen2009-11-201-6/+0
| | | | | | | | | these aren't *strictly* bogus, but rather confusing. the real issue is that the functions would get confused by something which looks like a BOM, but isn't, and there is nothing one could do about it. Reviewed-by: Volker Hilsheimer (cherry picked from commit bb4e301ce6762ab300618c579bd65ea1ee17dc2d)
* Improved documentation Qt for the Symbian platformAlessandro Portale2009-11-2014-70/+291
| | | | | | | | | | | | | | | | | | | | | | By Janne Anttila: - Switched links/references from 'S60' to 'Symbian' - Added collection page for Symbian specific documentation - Added page about application deployment for Symbian - Update supported compiler list for Symbian to more specific one - Added bullet about dev env. setup to Symbian installation page - Commented that SBSv2 is not offically supported by current S60 SDKs - Moved S60 3rd FP1 special patching note after SDK installation bullet - Recommedation to look into Qt quick start guide from Symbian Forum - Added Symbian bullet to known issues page and link to wiki - Added link to "state of support" document from symbian docs main page By aportale: - Rephrasing - More consistent naming of 'Qt for the Symbian platform' - Implementation of suggestions from other Nokians Reviewed-By: Janne Anttila (cherry picked from commit ea0f526ac3a7daef5d4ebff2373a01d4088e28c3)
* doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-204-17/+39
| | | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments. (cherry picked from commit d65bff4c94fb11bbad02420459a9375621051823)
* Doc: Add link to the Symbian Introduction.Volker Hilsheimer2009-11-201-0/+2
| | | | (cherry picked from commit 87e7b96ccf3385dcfff079a69a4c6e45f8b5bc52)
* Doc: Added an example to demonstrate the QWebElement class.David Boddie2009-11-2011-6/+300
| | | | | Reviewed-by: Trust Me (cherry picked from commit d46b4208147ec01aba19c703f21954f068b4dc06)
* Fix for compile error in Phonon MMF backendGareth Stockwell2009-11-207-62/+14
| | | | | | | | | | | | | | | | | This was introduced by d0b0b525de. The use of QT_NO_DEBUG macros causes release-armv5 builds to fail when the -release option is passed to configure. This change causes the debugging code (ObjectDump and related classes) to be included in release builds, although these functions are not executed. This is a temporary fix; task QTBUG-6012 has been created for re-removing this code from release builds. Reviewed-by: Frans Englich (cherry picked from commit f3118df6af745759a73d8a9f40d1fa1a90a4385a)
* Fix configure's accepting of old license keys (pre 4.6)Thiago Macieira2009-11-201-2/+2
| | | | | Reviewed-by: Peter Hartmann (cherry picked from commit 041f7fc92959d4aefa88fca7a6f5d153faf4aa0a)
* fix accepting of old license keys (pre 4.6)Peter Hartmann2009-11-202-2/+5
| | | | | Reviewed-by: Thiago Macieira (cherry picked from commit 9e75354eabbc3c58472ed0c3dc9cba831827c38a)
* Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | | | | | Reviewed-By: Trust Me (cherry picked from commit 1f6aa19209a7d22bb15bf0a0afb2d62200c0d3fa) (cherry picked from commit 2a444790abd05de2dd5aa546ad1745f911f2a73c)
* Doc: List planned changes to platform support in Qt 4.7Volker Hilsheimer2009-11-191-0/+17
| | | | (cherry picked from commit d5a92bdd3f0f355a05b8f6ceac577f0c12c3bd5d)
* Use a lowercase name for the binary of the Form Extractor exampleBenjamin Poulain2009-11-191-1/+1
| | | | | | | | The name of the other examples are lowercase. The XML file of Qt Demo reference a lowercase name. Reviewed-by: Olivier Goffart (cherry picked from commit 34044853d4315309920a481a585f96ba7b3fb140)
* Simply adds the Frozen Column example to qtDemoPierre Rossi2009-11-191-0/+1
| | | | | Reviewed-by: TrustMe (cherry picked from commit ac1bffa549e7f16fce3b009a68899e0d25574a7c)
* fancybrowser example: make sure that images are rotated for loaded pagesJocelyn Turcotte2009-11-193-4/+11
| | | | | | | See QTBUG-5532. Reviewed-by: Jedrzej Nowacki (cherry picked from commit 9f5dea393da4428685f1a1fd26b0e27f90dca340)
* Symbian docs: Repair some documentation damage, remove obsolete file.Frans Englich2009-11-192-136/+1
| | | | | | | | | | | | Reviewed-by: TrustMe Conflicts: doc/src/platforms/symbian-support.qdoc Something went wrong with the cherry-picks, spotted by Jason. Conflicting cherry-pick of 9a4995711746103286ea3fb9cc576e133fd29e4e. (cherry picked from commit 865409a01af971411c0b68a171d5b4c0242cf0a1)
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-197-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 7bdf90f753d25fb1b5628b0980827df11110ad5a ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com> Reviewed by Simon Hausmann. [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit. * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::render): 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. Clarify and simplify the legal section in the overview documentation, after review with our legal team. * docs/qtwebkit.qdoc: 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed and suggested by Tor Arne Vestbø. Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f to compare the Qt::ImFont property's family against an explicitly previously configured family. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods): (cherry picked from commit 1ca2903b81c77573d37c5bd486b8d8e49a87ffc1)
* Fix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012Jason McDonald2009-11-191-6/+0
| | | | | Reviewed-by: Bradley T. Hughes (cherry picked from commit bf01b2fada207ee171224386771445487054d42b)
* doc: Added a further note about what the MinGW package is needed for.Martin Smith2009-11-191-0/+4
| | | | | Task-number: QTBUG-5764 (cherry picked from commit 422ed1c94869e4a93a14602beef69f5b08941060)
* doc: Added note about which MinGW package to use and where to get it.Martin Smith2009-11-191-4/+16
| | | | | Task-number: QTBUG-5764 (cherry picked from commit 11f192c2bc15b468379032f329d8805aac4a0886)
* Compile with mixed carbon/cocoa universal builds.Morten Johan Sørvig2009-11-193-9/+23
| | | | | | | | | | | | | Moc got confused when Q3FileDialog was there in the carbon build but not in the cocoa build. (QT_MAC_USE_COCOA is defined by macros which moc does not evaluate) Fix this by porting Q3FileDialog to cocoa by using the compat functions in QFileDialog. revby:Prasanth Ullattil (cherry picked from commit e59d974ddf2f2a413611ba4d8594c6413499a645)