summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Derick Hawcroft2009-11-23350-2679/+2987
|\
| * Mention the changed architecture and license of QtScript in the 4.6.0 changelogSimon Hausmann2009-11-201-0/+2
| | | | | | | | Reviewed-by: Kent Hansen
| * Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-2035-136/+360
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-2030-95/+467
| | |\ | | | | | | | | | | | | 4.6-staging2
| | | * 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
| | | * QAbstractSlider: keypad navigation is slow.Frans Englich2009-11-192-4/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add logic to make keypad navigation faster when auto repeating. Task-number: QTBUG-5988 Reviewed-by: Gareth Stockwell
| | | * Symbian: QKeyEvent:isAutoRepeat() doesn't workFrans Englich2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6011 Reviewed-by: Gareth Stockwell
| | | * Fix crash when using splash screen, or QPixmap::copy()Shane Kearns2009-11-193-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing virtual function now implemented Task-number: QTBUG-5977 Reviewed-by: axis
| | | * Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | | | | | | | | | | | | | | | Reviewed-By: Trust Me
| | | * Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-192-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
| | | * Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-193-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
| | | * Use relative paths when invoking mifconv.Janne Anttila2009-11-191-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
| | | * Unified ICON keyword handling for ABLD and SBSv2 toolchains.Janne Anttila2009-11-191-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
| | * | 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
| | * | Remove unmatched else in non-EGL mode for OpenVG pixmap dataRhys Weatherley2009-11-201-1/+0
| | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta
| | * | 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
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Olivier Goffart2009-11-194-24/+51
| | |\ \
| | | * | Item views: make sure the model is connected/disconnected correctlyThierry Bastian2009-11-192-8/+30
| | | | | | | | | | | | | | | | | | | | Reviewed-by: ogoffart
| | | * | Item views: make sure the hovered item is updated when scrollingThierry Bastian2009-11-192-16/+21
| | | | | | | | | | | | | | | | | | | | Reviewed-by: leo
| | * | | Fixes regression in QListView: Selection would not expend to the full viewportOlivier Goffart2009-11-191-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
| | * | Add a QTest::qWaitForWindowShown for a failing qlistview autotestLeonardo Sobral Cunha2009-11-191-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | On main window, the sizegrip visibility was not correctly updatedThierry Bastian2009-11-192-8/+35
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4334 Reviewed-by: ogoffart
| | * | Fixes: QCommandLinkButton crop large icons.Olivier Goffart2009-11-192-8/+39
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-1976 Reviewed-by: Gabi
| | * | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1985-738/+10307
| | |\ \
| | * | | Complete QVariantAnimation doc to mention qRegisterAnimationInterpolatorThierry Bastian2009-11-191-1/+18
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5970
| | * | | Mark QGraphicsItemAnimation as deprecatedThierry Bastian2009-11-192-10/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5968
| | * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-11-1914-174/+150
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-1914-174/+150
| | | |\ \ | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | * | Disable linker warning 6780 in RVCT builds for Symbian OSIain2009-11-182-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker warning that indicates symbol visibility changes is not useful as it is an expected change to symbol visibility and produces lots of clutter in the build logs. (It is not desirable to follow the ELF spec when it comes to symbol visibility in this case, which is why the linker warns and we ignore it) This is likely to be a Raptor-only issue - I believe abld suppresses the warning by default (at least in ABIv1 mode) Also update gui.pro to use LFLAGS rather than MMP_RULES to alter the arguments to ARMCC toolchain. qmake ought to detect this (incorrect) usage of MMP_RULES and abort MMP file generation - raised QTBU-5961 to look at this. Reviewed-by: Shane Kearns
| | | | * | Fix tst_QTextLayout::testTabDPIScale on Symbian hardwareAlessandro Portale2009-11-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increased the sample positions of the tabs a bit in order to pass also un high DPI devices such as the XpressMusic 5800. The former positions were too narrow under high DPI, and overlapped by the text. Reviewed-By: Liang Qi
| | | | * | Symbian docs: Repair some documentation damage, remove obsolete file.Frans Englich2009-11-183-47/+24
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * | Changed MIF filename from UID to target name in Symbian.Janne Anttila2009-11-187-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
| | | | * | Incorporate feedback from marketing.Frans Englich2009-11-182-111/+83
| | | | | |
| | | | * | Symbian support: incorporate feedback from Lars.Frans Englich2009-11-181-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Espen Riskedal Reviewed-by: Frans Englich
| | | | * | Complement Phonon for Symbian documentation.Frans Englich2009-11-182-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gareth Stockwell
| | * | | | Convert pointer to string properly on 64 bit systems too.Jan-Arve Sæther2009-11-191-1/+1
| | |/ / /
| | * | | Fixed effects.pro after customshader demo removalGabriel de Dietrich2009-11-191-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes commit 9a0f7a1ef Reviewed-by: Olivier
| * | | | revert QT -= xml nonsenseOswald Buddenhagen2009-11-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we have CONFIG -= qt in bootstrap.pri, so all QT settings are irrelevant. the actual breakage comes from a bad cherry-pick in the release branch.
| * | | | QT —= xml for bootstrapped lreleaseOswald Buddenhagen2009-11-201-0/+2
| | | | |
| * | | | Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 ↵Simon Hausmann2009-11-2014-23/+110
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into 4.6
| | * | | | 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
| | |\ \ \ \
| | * | | | | Autotest: Change the service name we're testing between tests.Thiago Macieira2009-11-191-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, we get errors from one test to the next, due to the cleanup unregistering the name again. Task-number: QT-5588
| | * | | | | Remember to match the actual arguments too.Thiago Macieira2009-11-192-0/+20
| | | | | | |
| | * | | | | Disable the deprecation warning for this signal since we're using it nowThiago Macieira2009-11-191-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5972
| | * | | | | Revert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"Thiago Macieira2009-11-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188. Task-number: QTBUG-5972
| | * | | | | QTcpSocket: Fix waitForConnected on WindowsMarkus Goetz2009-11-192-7/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The select() system call was used in the wrong way. We need to select for exceptions too. Task-number: QTBUG-5799 Reviewed-by: Aleksandar Sasha Babic <aleksandar.babic@nokia.com> Reviewed-by: Peter Hartmann
| | * | | | | Enabled documentMode in assistant only on Mac.Denis Dzyubenko2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The doc says setting a document mode removes a frame, which makes assistant look weird on non-Mac platforms. Reviewed-by: Prasanth