summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Denis Dzyubenko2010-06-07375-7220/+21922
|\ | | | | | | 4.7-staging1
| * add check-ts target to auto-asses translation completenessOswald Buddenhagen2010-06-073-1/+92
| |
| * qt_ja_JP.ts => qt_ja.tsOswald Buddenhagen2010-06-072-1/+1
| | | | | | | | | | the other _ja files have no country qualification either, and it makes no sense anyway.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0720-51/+96
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix incorrect \since tag XQuery test suite (and others): remove p4 dependency add docu about pixmaps being invalidated on qapp destruction remove somewhat misleading warning about x11 pixmap leak Disabled item view items use incorrect background color Update the mkspec for linux-icc: don't use jump tables in shlibs Update the linux-icc mkspec make corewlan more namespace friendly Add convenience constructor to QTextOption::Tab Make qbswap() use glibc's fast bswap_*() functions if available. Fix in Addressbook tutorial Avoid timer starvation during high posted event activity fix for using .lnk files when running app from UNC
| | * Fix incorrect \since tagSimon Hausmann2010-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Changed the since added in 51fa7df978d71a366c95c732d6a8c2576690d63a from 4.6 to 4.7 Pointed out by Thorbjoern :) Reviewed-by: Trust me
| | * XQuery test suite (and others): remove p4 dependencyPeter Hartmann2010-06-071-4/+0
| | |
| | * add docu about pixmaps being invalidated on qapp destructionOswald Buddenhagen2010-06-071-0/+3
| | | | | | | | | | | | Reviewed-by: jbache
| | * remove somewhat misleading warning about x11 pixmap leakOswald Buddenhagen2010-06-071-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | the only situation where it would be actually true are broken drivers (or a broken x server as a whole). qt is not the right place to worry about that problem. Reviewed-by: jbache
| | * Disabled item view items use incorrect background colorJens Bache-Wiig2010-06-072-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a problem when using alternate row colors. We use a separate palette for base/alternate when using disabled colors. However, we should only use this if the entire view is disabled. To keep compatibility with style sheets we have to preserve the disabled state per item, but we now use the widget pointer to decide which palette role to use. Task-number: QTBUG-11263 Reviewed-by: ogoffart
| | * Update the mkspec for linux-icc: don't use jump tables in shlibsThiago Macieira2010-06-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | ICC generates jump table code that isn't PIC (i.e., it does absolute indirect jumps), so this increases the number of relocations in shared libraries by a huge amount. In QtCore it increased by 250% (from 3500 to 12000).
| | * Update the linux-icc mkspecThiago Macieira2010-06-071-8/+9
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0714-29/+75
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make corewlan more namespace friendly Add convenience constructor to QTextOption::Tab Make qbswap() use glibc's fast bswap_*() functions if available. Fix in Addressbook tutorial Avoid timer starvation during high posted event activity fix for using .lnk files when running app from UNC
| | | * make corewlan more namespace friendlyLorn Potter2010-06-061-8/+17
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0513-21/+58
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add convenience constructor to QTextOption::Tab Make qbswap() use glibc's fast bswap_*() functions if available. Fix in Addressbook tutorial Avoid timer starvation during high posted event activity fix for using .lnk files when running app from UNC
| | | | * Add convenience constructor to QTextOption::TabDavid Faure2010-06-045-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1734 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | | | * Make qbswap() use glibc's fast bswap_*() functions if available.Andreas Kling2010-06-041-0/+26
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
| | | | * Fix in Addressbook tutorialRobert Loehning2010-06-045-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't add if name or address is empty. Reviewed-by: Alessandro Portale
| | | | * Avoid timer starvation during high posted event activityBradley T. Hughes2010-06-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to commit bc01bb10da23d0d2308cf02a16947be836bc9a21, we need to avoid starvation of the idle time source by forcing a single, normal priority pass after processing posted events. Reviewed-by: ogoffart Task-number: QT-3467
| | | | * fix for using .lnk files when running app from UNCZeno Albisser2010-06-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since "" is an invalid target for a .lnk file, we can return false for doStat() in case of resolving the .lnk to "". Notice that .lnk files only allow absolute paths for the target. "" is returned by readLink in case the .lnk file does not exist. Reviewed-by: Joao Task-Number: QTBUG-10863
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-071-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed `make install' for qmediaplayer demo.
| | * | | Fixed `make install' for qmediaplayer demo.Rohan McGovern2010-06-071-1/+1
| | |/ / | | | | | | | | | | | | | | | | `sources.path += qmediaplayer.pro' where `sources.files += qmediaplayer.pro' was intended.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-079-45/+56
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed def file usage for Qt plugins under the makefile build system. Fixed def file usage for the makefile build system on the SDK plugin.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-059-45/+56
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed def file usage for Qt plugins under the makefile build system. Fixed def file usage for the makefile build system on the SDK plugin.
| | * | Merge branch 'def_files_and_plugins' into 4.7-s60axis2010-06-049-45/+56
| | |\ \
| | | * | Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-048-39/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would not use the autogenerated def files. RevBy: Thomas Zander
| | | * | Fixed def file usage for the makefile build system on the SDK plugin.axis2010-06-041-6/+11
| | | | | | | | | | | | | | | | | | | | RevBy: Thomas Zander
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-047-41/+269
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed unescaped backslashes in testcase.prf Skip tst_maketestselftest::make_check by default on Windows Fixed tst_maketestselftest on QWS and Windows. Add a test for the `make check' feature. Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf
| | * | | | Fixed unescaped backslashes in testcase.prfRohan McGovern2010-06-041-2/+2
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-047-41/+269
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Skip tst_maketestselftest::make_check by default on Windows Fixed tst_maketestselftest on QWS and Windows. Add a test for the `make check' feature. Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf
| | | * | | | Skip tst_maketestselftest::make_check by default on WindowsRohan McGovern2010-06-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nmake and checktest are too slow on Windows for this test to be enabled by default. Set RUN_SLOW_TESTS=1 to run the test manually.
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-037-41/+266
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed tst_maketestselftest on QWS and Windows. Add a test for the `make check' feature. Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf
| | | | * | | | Fixed tst_maketestselftest on QWS and Windows.Rohan McGovern2010-06-033-5/+26
| | | | | | | |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-037-41/+245
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add a test for the `make check' feature. Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf
| | | | | * | | | Add a test for the `make check' feature.Rohan McGovern2010-06-025-6/+179
| | | | | | | | |
| | | | | * | | | Fix `make check' for debug-and-release on Windows.Rohan McGovern2010-06-021-2/+16
| | | | | | | | |
| | | | | * | | | Move `check' target for autotests into testcase.prfRohan McGovern2010-06-022-35/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testcase.prf is installed, thus allowing `make check' to work outside of the Qt source tree.
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0416-20/+668
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647 Updated WebKit to de1e909b06cbc981d63e0fc0f6a3f84002dd1e80
| | * | | | | | | | Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647Simon Hausmann2010-06-044-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | || <https://webkit.org/b/40116> || [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed ||
| | * | | | | | | | Updated WebKit to de1e909b06cbc981d63e0fc0f6a3f84002dd1e80Simon Hausmann2010-06-0416-18/+650
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/39694> || [Qt] GraphicsLayer: warnings when reloading page || || <https://webkit.org/b/38762> || [Qt] Flash Plugin is not working on mac-cocoa-32 || || <https://webkit.org/b/39918> || REGRESSION(58615): Scroll events are sent twice per keypress for ports that don't have a platformWidget scrollbar || || <https://webkit.org/b/26224> || [Qt, Gtk] Allows build-webkit script to receive an install prefix as parameter || || <https://webkit.org/b/35861> || [Qt] Add documentation to the QtWebkit bridge || || <https://webkit.org/b/33176> || [Qt] The FIRST letter in the PASSWORD field is taken in UPPERCASE by DEFAULT in gmail.com web page ||
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-0413-5307/+9657
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Synchronizing to latest tree Adding correct hungarian translation Search local directory if no qconfig file found in src/corelib/global/ Fix QT_NO_CLIPBOARD Fix QT_NO_ACTION
| | * | | | | | | Synchronizing to latest treeGarami Gábor2010-06-047-444/+1096
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | * | | | | | | Adding correct hungarian translationGarami Gábor2010-06-048-5244/+8928
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations/assistant_hu.ts: Translated: 231 of 231 (100%) translations/designer_hu.ts: Translated: 85 of 1248 (6%) translations/linguist_hu.ts: Translated: 393 of 393 (100%) translations/qtconfig_hu.ts: Translated: 73 of 168 (43%) translations/qt_help_hu.ts: Translated: 80 of 81 (98%) translations/qt_hu.ts: Translated: 2402 of 2464 (97%) translations/qvfb_hu.ts: Translated: 65 of 65 (100%) Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | * | | | | | | Search local directory if no qconfig file found in src/corelib/global/Tasuku Suzuki2010-06-041-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure script searched qconfig-local.h under src/corelib/global/ with "-qconfig local". After this commit, configure tries to find local directory if the file is not found in the path. Now you can pass the option like "-qconfig ./qconfig-myconfig.h" Merge-request: 2341 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | * | | | | | | Fix QT_NO_CLIPBOARDTasuku Suzuki2010-06-042-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 658 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | * | | | | | | Fix QT_NO_ACTIONTasuku Suzuki2010-06-042-1/+6
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 657 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0417-244/+267
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add a note to the Linguist docs stating XLIFF 1.0 is not supported remove spurious empty lines in the linguist tools' output don't use qWarning() - or even qFatal()! - gratuitously. Styled item view backgrounds in Gtk+ Ensure that we only have one QLayoutStruct struct by renaming the other
| | * | | | | | Add a note to the Linguist docs stating XLIFF 1.0 is not supportedAndy Shaw2010-06-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earliest version we support is XLIFF 1.1, so now this is made clearer. Task-number: QTBUG-9193 Reviewed-by: Morten Engvoldsen
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-0416-242/+260
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: remove spurious empty lines in the linguist tools' output don't use qWarning() - or even qFatal()! - gratuitously. Styled item view backgrounds in Gtk+ Ensure that we only have one QLayoutStruct struct by renaming the other
| | | * | | | | remove spurious empty lines in the linguist tools' outputOswald Buddenhagen2010-06-036-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConversionData::error() does already newline-terminate the strings.
| | | * | | | | don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-0311-186/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8044