summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-2037-307/+369
|\
| * Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 ↵Simon Hausmann2009-11-2014-23/+110
| |\ | | | | | | | | | into 4.6
| * | Improved documentation Qt for the Symbian platformAlessandro Portale2009-11-1914-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
| * | Fix for compile error in Phonon MMF backendGareth Stockwell2009-11-197-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
| * | Fix configure's accepting of old license keys (pre 4.6)Thiago Macieira2009-11-191-2/+2
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | fix accepting of old license keys (pre 4.6)Peter Hartmann2009-11-192-2/+5
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
| * | Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | | | | | | | | | | | | | | Reviewed-By: Trust Me (cherry picked from commit 1f6aa19209a7d22bb15bf0a0afb2d62200c0d3fa)
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-19308-2702/+9733
| |\ \
| | * | 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
| | * | Simply adds the Frozen Column example to qtDemoPierre Rossi2009-11-191-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Fix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012Jason McDonald2009-11-191-6/+0
| | | | | | | | | | | | | | | | Reviewed-by: Bradley T. Hughes
| | * | 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.
| * | | remove bogus doc paragraphs relating to codecForUtfText()Oswald Buddenhagen2009-11-191-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
| * | | Properly return the absolute file path for help files.kh12009-11-191-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that can only be seen on windows when we have the collection storage location on e.g. Drive c:\ while the help files reside on a different drive. QHelpEngineCore::registerDocumentation would fail to gather the proper relative file path, thus register the file with it's absolute path. In QHelpEngineCore::documentationFileName we still assumed that all files in the collection are registered relative and fail to concatenate the proper path. Now we check if the path is already absolute and return. Reviewed-by: ck
| * | | Autotest guiapplauncher: Build fix MinGWFriedemann Kleint2009-11-191-4/+2
| | | | | | | | | | | | | | | | Reviewed-by: Thierry <thierry.bastian@nokia.com>
* | | | Revert check for file size to a warning in QFile::mapJoão Abecasis2009-11-191-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
* | | | Fixing the frame hierarchy traversing in framecapture WebKit example.Andre Pedralho2009-11-192-21/+18
| | | | | | | | | | | | | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | | | Updated the 'framecapture' WebKit example according to WebKit API changes.Andre Pedralho2009-11-192-4/+3
| | | | | | | | | | | | | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | | | Document known issue - window resizing slower on Windows 7 due to gestureVolker Hilsheimer2009-11-191-0/+5
| | | | | | | | | | | | | | | | initialization process creating window handles.
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-11-19422-3776/+13656
|\ \ \ \
| * | | | Doc: Adding documentation on Embedded Hardware accelerationMorten Engvoldsen2009-11-195-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
| * | | QNativeSocketEngine: Compile fixMarkus Goetz2009-11-191-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | QNAM HTTP Code: Use KeepAlive socket optionMarkus Goetz2009-11-191-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Revert "Revert "Fix detection of linux-g++""Simon Hausmann2009-11-194-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit baab5f7e77c1216ede839766c97abef1a708b365. Reviewed-by: Paul
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-19254-2206/+9154
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-1944-321/+486
| | |\ \
| | * | | Fix QCombobox painting regression on WindowsOlivier Goffart2009-11-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some style relies on this broken behaviour that was fixed in commit e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1 The text on the combobox uses the wrong palette role. Reviewed-by: jbache
| | * | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-19237-2013/+1773
| | |\ \ \
| | | * | | Remove examples/effects/customshader which uses private APITom Cooksey2009-11-1919-572/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3f109fd85cbdc49dc3ef1c14066073079f4e34bf made QGraphicsShaderEffect private API, however the example showing how to use it was kept. This patch just removes that example. Reviewed-by: Samuel
| | | * | | Ran the script utils/normalizeOlivier Goffart2009-11-18186-1243/+1243
| | | | | | | | | | | | | | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| | | * | | Fixed tst_QTableView::changeHeaderData auto-test on MacGabriel de Dietrich2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | | * | | Fixed tst_QTableView::mouseWheel auto-test on MacGabriel de Dietrich2009-11-181-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix reverts some changes from 1f4e378ca0f9c63bb99a92f3e98b104a0baa408a. Reviewed-by: Olivier
| | | * | | MAke a readonly QLineEdit not show "write" actions in its context menuThierry Bastian2009-11-181-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2494 Reviewed-by: Gabriel
| | | * | | Make the layout not grow in filndfiles example whne one clicks findThierry Bastian2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5528 Reviewed-by: Gabriel
| | | * | | QListView: fixes skipping one item in pageDown(Up)Leonardo Sobral Cunha2009-11-182-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation was scrolling down (number of visible items in viewport) + 1 and this was leading to one item being skipped while doing page down (the same also happened for page up). Now we are scrolling (number of visible items in viewport) - 1 for each page down(up) (the '-1' is for keeping the context, so the last item will turn into the first in case of a page down, for example). Task-number: QTBUG-5877 Reviewed-by: thierry
| | | * | | QListView: cleaning up whitespacesLeonardo Sobral Cunha2009-11-182-17/+7
| | | | | |
| | | * | | Fix html output of docsThomas Zander2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sub-title was too big which was caused by an unclosed anchor tag. Reviewed-by: David Boddie
| | | * | | QMenu: make the menu follow its parent/caused layout directionThierry Bastian2009-11-184-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotest are included Task-number: QTBUG-5884 Reviewed-by: ogoffart
| | | * | | Crash when rendering a scene using DeviceCoordinateCacheGabriel de Dietrich2009-11-182-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution flow would allow the widget the scene would be rendered on to be null. However this very widget was being used when using DeviceCoordinateCache to get the desktop size. We now skip this optimisation when no widget is given. Auto-test included. Reviewed-by: bnilsen Task-number: QTBUG-5904
| | | * | | Fix tst_QAlgorithms::test_qBinaryFind on solarisOlivier Goffart2009-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparison between const and non-const iterator is not safe Reviewed-by: Joao
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-11-188-112/+155
| | | |\ \ \
| | | | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-188-112/+155
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | * | | Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila
| | | | | * | | Put the dialog buttons into a scrollarea.Alessandro Portale2009-11-171-64/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, they fit into a smallscreen. Reviewed-By: TrustMe
| | | | | * | | Build without QT_KEYPAD_NAVIGATIONAlessandro Portale2009-11-172-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is actually not much of a point to run a keypadnavigation test without QT_KEYPAD_NAVIGATION being enabled. But let's at least build the app. Reviewed-By: TrustMe
| | | | | * | | Fix DrillDown for moblie devices.Alessandro Portale2009-11-171-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Use QFormLayout instead of QGridLayout 2) Remove Symbian specific size hack 3) Give button box a parent, so that it's buttons get properly added as the dialog's softkeys. 4) Add submitButton with a positive button role Task-number: QTBUG-5685 Reviewed-by: Jason Barron
| | | | | * | | showMaximized() lets us see SoftKeysAlessandro Portale2009-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation would not show Softkeys as long as we show a widget via showFullScreen. Therefore, on Symbian we will for now use showMaximized Reviewed-By: Jason Barron
| | | | | * | | QS60Style returns hint QFormLayout::WrapLongRowsAlessandro Portale2009-11-172-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get a mobile friendly 1-column layout, we can set QFormLayout's rowWrapPolicy. S60Style should return QFormLayout::WrapLongRows as the SH_FormLayoutWrapPolicy styleHint. Reviewed-by: Jason Barron
| | | | | * | | Incorporate feedback by Espen.Frans Englich2009-11-171-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Espen Riskedal
| | | * | | | | Export QStateMachine::WrappedEvent and QStateMachine::SignalEventEskil Abrahamsen Blomfeldt2009-11-182-2/+10
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two classes were missing exports. Since the accessors are inline, the bug would only be visible when someone tried to call the constructors of the classes. Reviewed-by: Kent Hansen