summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexPasi Pentikainen2011-09-135-1/+9
|\
| * Update QDesktopServices openUrl() documentation on Symbian OSJuha Kukkonen2011-09-121-0/+3
| | | | | | | | | | | | | | | | | | | | QDesktopServices openUrl() does not reload the given URL if browser is already open unless application has SwEvent capability. Capability is required because this scenario involves sending a message to window group in other process. Task-number: QTBUG-15725 Reviewed-by: Honglei Zhang
| * Mark binaries as SMPSAFE in SymbianPasi Pentikainen2011-09-122-0/+4
| | | | | | | | | | Task-number: QTBUG-11769 Reviewed-by: Laszlo Agocs
| * Add a cast to moc cpp generator to remove armcc warningsPasi Pentikainen2011-09-061-1/+1
| | | | | | | | | | Task-number: QT-3869 Reviewed-by: Murray Read
| * Fix QColumnView auto test failureJuha Kukkonen2011-09-011-0/+1
| | | | | | | | | | | | | | | | Changed scrollTo test to wait until animation is finished before checking horizontalOffset. Task-number: QTTH-1461 Reviewed-by: Miikka Heikkinen
* | Fix "sbs -c tools2 --what" output for Qt.Miikka Heikkinen2011-09-122-42/+102
| | | | | | | | | | | | | | | | | | | | | | Doing "sbs -c tools2" exports Qt headers under epocroot, but didn't list the exported headers with "--what". Added "-what" parameter support to headerexport perl script and utilized that in qtconfig.flm to generate list of exported files for "sbs -c tools2 --what". Task-number: QTBUG-21155 Reviewed-by: Sami Merila
* | Update environment.prfMiikka Heikkinen2011-09-091-3/+2
| | | | | | | | | | | | S60_VERSION and SYMBIAN_VERSION were obsolete in environment.prf. Reviewed-by: Sami Merila
* | QS60Style: Make spinboxes and lineedits slightly tallerSami Merila2011-09-081-6/+12
| | | | | | | | | | | | | | | | | | | | Make spinboxes and lineEdits as tall as comboboxes are. This makes these components to look more like native components. Since spinbox frame width was previously zero, changing the value revealed some button positioning issues. Task-number: QT-4175 Reviewed-by: Miikka Heikkinen
* | runonphone: Add a missing space between a message and the file nameMartin Storsjo2011-09-071-1/+1
| | | | | | | | | | Merge-request: 2670 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | runonphone: Allow overriding the temporary sis file nameMartin Storsjo2011-09-071-2/+6
| | | | | | | | | | Merge-request: 1300 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | Merge remote branch 'qt/4.8'Shane Kearns2011-09-07124-497/+2034
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-0712-7/+51
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix build for desktop Fix the build with -qtnamespace configure options
| | * | fix build for desktopKonstantin Ritt2011-09-072-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG: 20236 Merge-request: 2672 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-0610-5/+38
| | | | | | | | | | | | | | | | | | | | Merge-Request: 1291 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-09-0726-77/+364
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)
| | * \ \ Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-0626-77/+364
| | |\ \ \ | |/ / / /
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-09-0626-77/+364
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)
| | | * | | Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)Ademar de Souza Reis Jr2011-09-0626-77/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes since last sync: [https://webkit.org/b/66016 #66016]: [Qt] Add test for correct order of load signals in QWebPage [https://webkit.org/b/28851 #28851]: Emit last progress notification before calling dispatchDidFinishLoad [https://webkit.org/b/67285 #67285]: [Qt] Unskip API test for load signals order [https://webkit.org/b/67307 #67307]: [Qt][Symbian] REGRESSION(93235) Missing .def update [https://webkit.org/b/49448 #49448]: (restricted bug) [https://webkit.org/b/64737 #64737]: (restricted bug) [https://webkit.org/b/64741 #64741]: (restricted bug) [https://webkit.org/b/66015 #66015]: (restricted bug) [https://webkit.org/b/66141 #66141]: (restricted bug) [https://webkit.org/b/66360 #66360]: (restricted bug) [https://webkit.org/b/66699 #66699]: (restricted bug) [https://webkit.org/b/66799 #66799]: (restricted bug) [https://webkit.org/b/67556 #67556]: (restricted bug)
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-09-067-6/+65
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4
| | * \ \ \ \ Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-067-6/+65
| | |\ \ \ \ \ | |/ / / / / / | | | _ / / / | | | / / /
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-09-05315-4753/+20941
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (179 commits) Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4 Doc: added since tag to QDateTime::msecsTo QDeclarative::hasActiveFocus should return false for hidden items FocusScope's focusItem must always be a descendent Fix conversion of QAbstractItemModel::rowsMoved() parameters Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths" Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths" In 4.7 QFileInfo::absolute(File)Path returned clean paths Porting the QTBUG-21084 fix to 4.7.4 ret is an "internal" path, no need to re-process it We prefer capitalized drive letters, make it so sooner Don't second-guess the "engine"; call cleanPath on absolutePaths Compare non-canonical paths before falling back on expensive computation Fix QDir::operator==(const QDir &) const Fixed use of deleted object in XmlPatterns EvaluationCache Check if bridge plugin vector is still valid. uikit: get rid of the "min 30fps" for event handling. uikit: update README QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list Crash when creating scroll bar skin graphics on S60 (debug only) ...
| | | * | | Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4Ademar de Souza Reis Jr2011-08-307-6/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes since last sync: [https://webkit.org/b/61235 #61235]: JavaScriptCore doesn't build on MinGW-w64 [https://webkit.org/b/67055 #67055]: [Qt] Do not unconditionally use pkg-config in .pro files
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-052-2/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed the unnecessary dependency of the QtHelp module on the QtXml one
| | * | | | Removed the unnecessary dependency of the QtHelp module on the QtXml oneConstantin Makshin2011-09-052-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-09-0342-100/+415
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (33 commits) Revert readonly BorderImage::sourceSize change URLs used with scheme handler use appropriate encoding for scheme Fix memory leak in ListModel custom parser DEF file update If automatic translation of input widget is off, skip reset Prevent leakage of native window handles QSslCertificate: blacklist fraudulent *.google.com Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter Added an additional check to workaround an issue on Windows. Exact word bubble doesn't disappear when screen is tapped (fix part 2) Exact word bubble doesn't disappear when screen is tapped Compile fix for Symbian 5th and earlier Symbian: Fix backspace on empty lines of multiline textedits Handle CloseSoftwareInputPanel event in QCoeFepInputContext Fix delayed password masking mid-string. Disabled splitscreen translation still moves screen Make text rendering working outside the gui thread on Symbian. Fix softkeys cleanup Fix clientRect usage in QWidgetPrivate::setGeometry_sys() Do not allow fullscreen/maximized windows to expand beyond client rect ...
| | * \ \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-0313-63/+521
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-09-039-202/+168
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Modified \since command behavior slightly to handle project and version.
| | * | | | | | Modified \since command behavior slightly to handle project and version.David Boddie2011-09-029-202/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606) Reapplied after bad v4.7.4 merge
| | * | | | | | Merge remote-tracking branch 'origin/4.8'Liang Qi2011-09-0238-112/+353
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-09-0211-25/+521
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Update license headers Silently ignore a wrong parameter count instead of crashing Introducing --address <bus> parameter to qdbus Introduce menubar plugin system Introduce QAbstractPlatformMenuBar Hide Q<Platform>MenuAction Fix warning about initialization order
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-01610-6034/+13579
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (75 commits) Update license headers Fix build with Clang for libpng versions 1.4.0 to 1.5.2 Silently ignore a wrong parameter count instead of crashing Introducing --address <bus> parameter to qdbus Fix Symbian system date format parsing. Fix QXmlSimpleReader auto test failer QSslCertificate: also check common name for blacklisted certificates QSslCertificate: regenerate blacklisted certificates, they were expired don't crash when destroying the shortcuts Doc: added since tag to QDateTime::msecsTo QSslCertificate: blacklist fraudulent *.google.com QDeclarative::hasActiveFocus should return false for hidden items FocusScope's focusItem must always be a descendent qdoc3: Updates to qdoc to print error message in ALL CAPS Fix pointer event mapping when windows are fixed to native orientation Do not unconditionally use pkg-config in .pro files Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0 Doc: Added a note to Code Editor example docs ...
| | | * | | | | | | | Update license headersGabriel de Dietrich2011-09-013-54/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ammends commit 9aeadca09ab4e27ebf299873f90490d585b4fb7f Reviewed-by: Frederik Gladhorn Merge-request: 1254
| | | * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-31120-1143/+2604
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Silently ignore a wrong parameter count instead of crashingPeter Grasch2011-08-311-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1363 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | | * | | | | | | | | Introducing --address <bus> parameter to qdbusPeter Grasch2011-08-311-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1363 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | | * | | | | | | | | Merge branch '4.8' into water-team-masterFrederik Gladhorn2011-08-3110-24/+511
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Introduce menubar plugin systemAurélien Gâteau2011-06-204-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| | | | * | | | | | | | | Introduce QAbstractPlatformMenuBarAurélien Gâteau2011-06-206-11/+457
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| | | | * | | | | | | | | Hide Q<Platform>MenuActionAurelien Gateau2011-06-205-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help abstracting the platform specific parts of QMenuBarPrivate in a common interface. Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| | | | * | | | | | | | | Fix warning about initialization orderAurélien Gâteau2011-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1254 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| | | * | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-30481-4866/+10454
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-292-4/+77
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix conversion of QAbstractItemModel::rowsMoved() parameters
| | | * | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-292-4/+77
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-2899-966/+1249
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (45 commits) Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths" Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths" In 4.7 QFileInfo::absolute(File)Path returned clean paths Porting the QTBUG-21084 fix to 4.7.4 ret is an "internal" path, no need to re-process it We prefer capitalized drive letters, make it so sooner Don't second-guess the "engine"; call cleanPath on absolutePaths Compare non-canonical paths before falling back on expensive computation Fix QDir::operator==(const QDir &) const Fixed use of deleted object in XmlPatterns EvaluationCache uikit: get rid of the "min 30fps" for event handling. uikit: update README Crash when creating scroll bar skin graphics on S60 (debug only) Fix memory leak in ListModel custom parser QS60Style omits drawing theme background in some Symbian SDKs Fix for qml1shaderplugin GPU resource handling on Symbian Fix QGLGlyphCache for Open GL ES (1). Revert "Include trailing space width in RTL text line width" Fix justification of RTL text uikit: fix examples to no longer ship the custom fonts ...
| | | * | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-2834-112/+477
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-2764-853/+769
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-262-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-09-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Added an additional check to workaround an issue on Windows.
| | * | | | | | | | | | | | | | Added an additional check to workaround an issue on Windows.David Boddie2011-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
| | | | | | | | | | | | * | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-023-8/+12
| | | | | | | | | | | | |\ \ \ \