summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexAapo Haapanen2011-09-265-3/+51
|\
| * Fix QXmlQuery autotest failure.Juha Kukkonen2011-09-262-3/+19
| | | | | | | | | | | | | | | | Changed XQuery functions fn:doc() and fn:doc-available() to work with URLs without scheme when accessing files. Task-number: QT-4962 Reviewed-by: Honglei Zhang
| * Lower case as default in password entry in Symbian port.Jarkko T. Toivonen2011-09-261-0/+7
| | | | | | | | | | | | | | | | The text case "Abc" is removed from the permitted cases because passwords are rarely sentences but random characters. Task-number: QTBUG-10312 Reviewed-by: Shane Kearns
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexAapo Haapanen2011-09-230-0/+0
| |\ | | | | | | | | | | | | Conflicts: src/xmlpatterns/api/qxmlquery.cpp
| | * fix for QTBUG-18050: QXmlQuery crashAapo Haapanen2011-09-221-0/+5
| | |
| * | Fix for QTBUG-18050: QXmlQuery crashAapo Haapanen2011-09-232-0/+25
| |/ | | | | | | | | | | | | | | | | If QXmlQuery has a previous focus and an invalid xml is given in setFocus, the old focus must be cleared. Otherwise the query may be left in an inconsistent state. Task-number: QTBUG-18050 Reviewed-by: Miikka Heikkinen
* | Fix plugin implicit loading when calling QPluginLoader::instance().Miikka Heikkinen2011-09-262-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QPluginLoader::instance() didn't increase loading refcount if another QPluginLoader had already loaded the plugin. This meant that if the another QPluginLoader subsequently unloaded the plugin, the instance would be destroyed even if the second loader still wanted to use it. Also improved the tst_QPluginLoader::deleteinstanceOnUnload() test case to test more combinations of deletion order and explicit/implicit loading. Task-number: QT-5259 Reviewed-by: Sami Merila
* | Symbian - perform some FS initialisation previously done by open cShane Kearns2011-09-232-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using Qt 4.6 and 4.7, the working directory is set to the same drive the application is installed on by the open c library. The default working directory in symbian is always the private directory on the system drive, but we told people to rely on the open c behaviour. Open C also creates the private path on both the system and installation drives when the application is started. This behaviour is also replicated now in Qt 4.8 for backward compatibility of apps that may rely on it. Similar code to create the private path on the installation drive in QCoreApplication::applicationDirPath() has been removed, as the new code in this patch is always executed first. Task-Number: QTBUG-21527 Reviewed-By: mread
* | symbian - Document behaviour of QDir::rootPath / homePathShane Kearns2011-09-231-4/+6
| | | | | | | | | | | | | | | | | | The root path was intentionally changed to reflect the real drive root, while home path continues to reflect the user data directory. Task-Number: QTBUG-21527 Reviewed-By: Miikka Heikkinen
* | The cursor can get offscreen in splitscreen landscape modeSami Merila2011-09-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | When input context is making the translation, it doesn't check if the translation is happening to the correct direction (i.e. upwards or downwards). As a fix, check if the cursor is still visible after making the translation. If it isn't apply the translation to the other direction. Task-number: QTBUG-21543 Reviewed-by: Miikka Heikkinen
* | Improve sbsv2 whatlog support.Miikka Heikkinen2011-09-223-2/+12
| | | | | | | | | | | | | | | | | | All builds will now add anything generated via QMAKE_EXTRA_COMPILERS to whatlog. In addition, platform builds will now add to whatlog the exported mkspecs and qmake_clean.flm that were missing. Task-number: QTBUG-21591 Reviewed-by: Sami Merila
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexPasi Pentikainen2011-09-221-0/+8
|\ \ | |/
| * Fix the incorrect sizeHint given by QLabel on SymbianJarkko T. Toivonen2011-09-151-0/+8
| | | | | | | | | | | | | | | | Using the S60 clientRect width in the QLabel size hint calculation (instead of assuming that 80 characters will fit on one line). Task-number: QTBUG-14318 Reviewed-by: Murray Read
* | Modified SymSQL documentation in sql-driver.qdoc according review commentsTimo Kauppinen2011-09-211-37/+92
| | | | | | | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
* | Added correct licence headers to symsql source filesTimo Kauppinen2011-09-213-54/+54
| | | | | | | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
* | Documentation modifications for SymbianSQL added into sql-driver.qdocTimo Kauppinen2011-09-211-1/+47
| | | | | | | | | | Task-number: QT-4860 Reviewed-by: Honglei Zhang
* | Release Symbian SQL driverHonglei Zhang2011-09-211-175/+124
| | | | | | | | | | | | | | | | | | | | Symbian SQL driver provides service of secure databases. SQL databases are stored in Symbian SQL server's private data cage. The API ensures only authorised clients can access the database. The Symbian SQL driver enables Qt application to use Symbian secure databases. Task-number: QT-4860 Reviewed-by: Trust Me
* | Fixed a typo found by static checkerTimo Kauppinen2011-09-211-1/+1
| | | | | | | | | | Task-number: QT-4860 Reviewd-by: Honglei Zhang
* | Added SQL driver plugin implementation for Symbian.Timo Kauppinen2011-09-215-0/+1467
| | | | | | | | | | | | | | The Symbian SQL driver enables the usage of native Symbian SQL server from Qt code. Symbian SQL driver also supports the usage of Symbian platform security capabilities. Task-number: QT-4860 Reviewed-by: Honglei Zhang
* | Symbian: Fix qmdiarea autotest regressionsMiikka Heikkinen2011-09-211-10/+10
| | | | | | | | | | | | | | | | | | | | Some cases in qmdiarea test passed on 4.7 but failed on 4.8. A closer examination reveals that the cases are in any case invalid in Symbian and should be skipped like in WinCE and Mac. Task-number: QT-5254 Reviewed-by: Sami Merila
* | Merge branch 'SchemaMemLeak'Honglei Zhang2011-09-2110-213/+218
|\ \
| * | Fix memory leaks in schema validationHonglei Zhang2011-09-2110-213/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fix for QTBUG-12550. QExplicitlySharedDataPointer is excessively used in XmlPatterns code. This forumate cyclic loops in some situation. This fix replace the shared data pointer with normal C++ pointer to break the loop. Task-number: QTBUG-12550 Reviewed-by: Tomi Vihria
* | | Symbian: Added copy-paste functionality to FEP input contextMiikka Heikkinen2011-09-212-20/+597
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The support for copy-paste functionality in FEP was initially submitted as merge request #1151, though that only provided support for basic Qt edit widgets. I modified the code so that QML edit elements are also supported, as well as any other editor that provides the required "copy", "cut", and "paste" slots, and "canPaste" property. A number of other minor fixes were also done to the original merge request, as well as the removal of S60 version plugin elements. Task-number: QTBUG-20921 Reviewed-by: Sami Merila
* | | symbian: Implement QNetworkConfiguration::purpose()Shane Kearns2011-09-202-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNetworkConfiguration::purpose() will now return translated values for the system SNAPs rather than always UnknownPurpose. e.g. the "Internet" SNAP returns PublicPurpose, and the WAP/MMS SNAPs return ServiceSpecificPurpose. IAPs inherit the purpose of the service network that contains them, unless the same IAP is present in more than one with conflicting purposes, in which case UnknownPurpose is returned. Task-Number: QTBUG-19166 Reviewed-By: mread
* | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-20118-705/+1495
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-207-16/+42
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed automatic plugin path resolving for predefined Qt plugins. Resolve a number of compilation issues with INTEGRITY Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
| | * | | Fixed automatic plugin path resolving for predefined Qt plugins.Janne Anttila2011-09-191-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Qt is configured for static build, importing static plugins is supposed to work as described in docs: http://doc.qt.nokia.com/latest/qtplugin.html#Q_IMPORT_PLUGIN This commit updates the qmake mapping for predefined Qt plugins, so that Qt plugins are automatically found when QTPLUGIN keyword is used. Task-number: QTBUG-18609 Merge-request: 1391 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | Resolve a number of compilation issues with INTEGRITYRolland Dudemaine2011-09-195-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode. Also, correct a typo and add missing files to io.pri. Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools. Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it. Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition). Merge-request: 2686 Reviewed-by: ossi
| | * | | Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTUREAndy Shaw2011-09-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves a build issue on Solaris as the symbols were missing so they are now added in the expected way after discussion with the Nokia developer who approved the patch originally for winscw. Task-number: QTBUG-21523 Merge-request: 1389 Reviewed-by: ossi
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-09-195-18/+94
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: minor docu fixes Mingw compile error src/gui/accessible/qaccessible_win.cpp Implement QAccessibleActionInterface for menu actions. Do not leak memory
| | * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-1811-25/+271
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: QGraphicsWidget::setLayoutDirection doesn't propagate to new children Prevent unnecessary graphics item updates when graphics effect changes. Use more widely supported Unicode character representation Release font engine refcount when done using it in QTextEngine Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus Updated Changelog Do not put cursor at non-stop character positions doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs
| | | * \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-09-1811-25/+271
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-170-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
| | | * | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-170-0/+0
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-1614-118/+51
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Update changes file. wtf? .pro.user files? congrats to overriding the hook! Fix QNetworkReply::errorString returning an untranslated string runonphone: Add a missing argument for QString::arg StrictlyEnforceRange with snapOneItem/Row and header behavior change Release font engine refcount when done using it in QTextEngine Migrate addMarkUp function to QChar. update the proxy info before session is opened in QNAM by Aapo Makela QSslCertificate: block all DigiNotar (intermediate and root) certs QSslCertificate: also check common name for blacklisted certificates Fix typo in header guard. fix doc typo Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk remove obsolete define Fix assert error on Windows with a negative char. Doc: Fixed the example of an encoded URL in the class description. Added an additional check to workaround an issue on Windows.
| | | * | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-1614-118/+51
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-161-5/+5
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: minor docu fixes
| | | * | | | | | | minor docu fixesKonstantin Ritt2011-09-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2646 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-1530-54/+351
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix crash in compiled bindings Updated WebKit to 64cce10 (qtwebkit-rc1, week36)
| | | * | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-1530-54/+351
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-151-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Mingw compile error src/gui/accessible/qaccessible_win.cpp
| | | * | | | | | | | Mingw compile error src/gui/accessible/qaccessible_win.cppMarkku Heikkila2011-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (*pvarState).lVal = elem.iface ? elem.iface->state(elem.entry) : 0; at least, gcc-4.4.3 complains the mismatched types of elem.iface->state(elem.entry) and 0, aslike, Merge-request: 1377 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-1056-473/+547
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (36 commits) Disable autotest broken by the change to QCache in 7ab0bed find qt.conf more reliably Generate glyphs in un-transformed coordinate system. Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT Reset trailingSpaces in relayout Prevent QPixmapCache potentially growing indefinitely. Allocate 16-byte aligned memory independent of platform for raster pool. qmake vcxproj generator: fix XML conversion for build events Fix trailing spaces problem by not adding it to QScriptLine.length Fix RTL layout for fonts when non-printable character has an advance Fix regression in tst_qrawfont Fix double click and drag not extending word selection. Split CFLAGS from pkg-config properly Ensure that the proxystyle is used over the style's own functions runonphone: Add a missing space between a message and the file name Perl check for windows configure. QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded QSettings: use the common appdata dir when bootstrapping qmake on win Merge fixes for QDir::operator== Replace explicit surrogate handlers by inline methods of QChar class ...
| | | * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-1034-320/+387
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-09-0925-153/+160
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-085-2/+62
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Dragging in nested views no longer works as expected Fix implicit height not growing when pre-edit text wraps. Fix leak in State element. Fix leak in bindings created by PropertyChanges.
| | | * | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-085-2/+62
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-082-8/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Implement QAccessibleActionInterface for menu actions.
| | | * | | | | | | | | | | Implement QAccessibleActionInterface for menu actions.Frederik Gladhorn2011-09-082-8/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to open and trigger menu items via actions using the dedicated action interface. Reviewed-by: Jan-Arve
| | * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-0739-88/+420
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: fix build for desktop Do not leak memory Fix the build with -qtnamespace configure options Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)