summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Remove one local variable from QCoeFepInputContextSami Merila2011-10-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hasText variable as it is not used anywhere. Reviewed-by: Miikka Heikkinen
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-042-3/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian: Fix native dialog with splitscreen VKB focus loss issue
| | * | | | | | Symbian: Fix native dialog with splitscreen VKB focus loss issueMiikka Heikkinen2011-10-042-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a native input dialog that utilized splitscreen VKB was opened while focus was on QML TextEdit element, the focus would not be restored to QML TextEdit element after native dialog was closed. This happened because the KSplitViewCloseEvent came after FocusChanged, as the focus changes are ignored while splitview VKB is open. Task-number: QTBUG-21733 Reviewed-by: Sami Merila
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-047-9/+102
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Create auto test for http HEAD request QNAM - fix poor performance of HEAD request with authentication runonphone - Implement CODA autodetection
| | * | | | | | Create auto test for http HEAD requestShane Kearns2011-10-043-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in order to have a regression test for QT-5304. However the test is also checking basic functionality of head requests too. Task-Number: QT-5304 Reviewed-By: Martin Petersson
| | * | | | | | QNAM - fix poor performance of HEAD request with authenticationShane Kearns2011-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHttpNetworkReply was waiting for a body to be sent for 401 and 407 responses, whereas with a HTTP HEAD request, there will be no body. This delayed the authentication signal until after the http channel is closed by the server after a timeout. For example with the server used for autotesting, the authentication signal is delayed 15 seconds. When the server has a very long timeout, the authentication signal may not be emitted at all. Task-Number: QT-5304 Reviewed-By: Martin Petersson
| | * | | | | | runonphone - Implement CODA autodetectionShane Kearns2011-10-043-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If runonphone is executed without specifying the debug agent, then it will attempt to autodetect it by sending a CODA ping to the USB port. If there is a reply within 1 second, then CODA mode is used. If not, then TRK mode is used. TRK drops unrecognised messages, so the CODA ping is ignored and initialisation starts normally when the TRK ping is sent. Autodetect can be skipped by using the --coda or --trk arguments on the command line to force use of a specific debug agent. Reviewed-By: mread
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-0323-155/+282
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (28 commits) Symbian: Parse ts filenames case-insensitively for localize_deployment Do not crash in copy() of pixmaps without an underlying bitmap QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8 Doc updates to Qt for Symbian installation instructions and platform notes. Doc updates to platform notes document. Fix accessible menu not returning child name. Fix broken qglthreads autotest build on Solaris. Doc updates to platform notes of Qt 4.8 doc. Disabled activeqt/webbrowser example from mingw build. Don't store the alignment attribute for spacers Doc updates to Qt 4.8 platform notes documentation. Update changelog for Qt-4.8.0: add QtWebKit notes Update changelog for Qt 4.8 Fix broken Solaris build (getpwnam_r usage) Sentences should end with a period! (Poor man's rebuild trigger.) Update changes-4.8.0 file Only limit cursor position when line is wrapped Workaround MSVC2010 problems when linking QtWebKit dos2unix on a webkit source file (fix support for Visual Studio) Update changelog for Qt 4.8 ...
| | * | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-0318-112/+247
| | |\ \ \ \ \ \
| | * | | | | | | Symbian: Parse ts filenames case-insensitively for localize_deploymentMiikka Heikkinen2011-09-303-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of platform applications have all-lowercase translation files due to file naming policies. This makes no difference for runtime translation, so removed unnecessary case sensitivity when parsing ts filenames for localization deployment. Task-number: QT-5305 Reviewed-by: Sami Merila
| | * | | | | | | Do not crash in copy() of pixmaps without an underlying bitmapLaszlo Agocs2011-09-301-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CFbsBitmap::Create() fails for some reason (e.g. due to lack of memory), we may end up with a QVolatileImage for which the underlying bitmap pointer is null, resulting in the QImage wrapper being null too. The copyFrom() function was not checking for this situation and started to copy data blindly to the null QImage's bits(), which is a null pointer. This is now fixed so no copying occurs in such a scenario. Task-number: QTTH-1446 Reviewed-by: Sami Merila
| | * | | | | | | QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8mread2011-09-291-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_qobjectrace had some of its tests disabled for Symbian builds because they were not working with Symbian's event dispatcher. Retesting with Qt 4.8, which has a new event dispatcher, shows that they are now working. The tests are re-enabled again. They ran successfully on E7, N8 and emulator many times without crashing. Task-number: QTBUG-9113 Reviewed-by: Shane Kearns
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-2811-128/+311
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: symbian - document behaviour of QFile::handle() New focusitem is not connected to the translate slot in splitview Added new private exports to DEF files New plugin detection for Symbian Added Symbian private API to update libraryPaths Making QNotifyChangeEvent, Symbian file watcher, more widely usable
| | * | | | | | | symbian - document behaviour of QFile::handle()Shane Kearns2011-09-281-0/+7
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Merila2011-09-288-104/+249
| | |\ \ \ \ \ \ \
| | | * | | | | | | Added new private exports to DEF filesmread2011-09-282-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change lists new private exports in the Symbian def files for: - QCoreApplicationPrivate::rebuildInstallLibraryPaths - QFactoryLoader::updateDir There are also some QFutureWatcherBase exports added to the winscw DEF file which appear to have not been added before. Task-number: QTBUG-20098 Reviewed-by: Shane Kearns
| | | * | | | | | | New plugin detection for Symbianmread2011-09-282-76/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian can have very long running apps, which expect to pick up new plugins without a restart. This change makes the plugin factory, which is used for many internal plugin types, detect plugin changes and update its list of plugins. This uses the QNotifyChangeEvent class to watch for plugin directory changes, including when they do not already exist, including on removable drives with no media currently present. When a change is detected, it triggers a rebuild of the plugin library paths, then rescans for plugins only on the drive that changed. An alternative implementation could have made use of watching software installer P&S keys for notification of change. However these are not triggered by memory card insertion or removal, so file system watchers are used. Task-number: QTBUG-20098 Reviewed-by: Shane Kearns
| | | * | | | | | | Added Symbian private API to update libraryPathsmread2011-09-282-17/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library paths on Symbian can change as memory cards are inserted or removed. Potentially there is a \resource\qt\plugins on a card which should be added to the library path. Since some Symbian Qt applications are expected to be very long running, they would not see an updated library path without this abililty to update the path. The update algorithm strips out existing instances of \resource\qt\plugins, places new ones where the first \resource\qt\plugins was, and leaves the rest of the library path unchanged. Task-number: QTBUG-20098 Reviewed-by: Shane Kearns
| | | * | | | | | | Making QNotifyChangeEvent, Symbian file watcher, more widely usablemread2011-09-282-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNotifyChangeEvent was being used by QSymbianFileSystemWatcherEngine, but it also helps in the implementation of new plugin watching for QTBUG-20098. So it has been generalised to work with an interface and any class that implements that interface. The Qt file system watchers could not be used in QTBUG-20098, as they will not watch for currently non-existing directories. Task-number: QTBUG-20098 Reviewed-by: Shane Kearns
| | * | | | | | | | New focusitem is not connected to the translate slot in splitviewSami Merila2011-09-282-24/+55
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user changes focus from one item to a new one while the splitview keyboard is open, the newly focused item is not connected to the translate() slot. Thus, the item will not be kept "automatically" visible above the keyboard when cursor position changes. QCoeFepInputContext now holds a pointer to the last focus item and disconnects the previous focus item from slot when new focus item is set. Ensuring the visibility of the focus item needs to be done asynchronously after reset() has been called from graphics scene, to ensure that new focus item has been set. The translation rules have been tweaked to support translation to both directions (up|down). Previous implementation worked properly only for upwards translation (new cursor position was assumed to be lower than the existing one). Task-number: QTBUG-21611 Reviewed-by: Miikka Heikkinen
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-283-18/+26
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix building against older Symbian^3 environments Fix QTextBrowser autotest to use "file" scheme in URLs.
| | * | | | | | | Fix building against older Symbian^3 environmentsMiikka Heikkinen2011-09-281-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | R_AVKON_DISCREET_POPUP_TEXT_COPIED is missing from some older Symbian^3 environments, so define it explicitly. Also do not attempt to show the popup unless running against newer versions. Reviewed-by: Sami Merila
| | * | | | | | | Fix QTextBrowser autotest to use "file" scheme in URLs.Miikka Heikkinen2011-09-282-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A security fix to QUrl that causes it to no longer interpret URLs without scheme as local files broke QTextBrowser test case. Added the necessary "file" schemes to URLs used in the test. Also added a mention about necessity of using "file" scheme to QTextBrowser documentation. Task-number: QT-5286 Reviewed-by: Sami Merila
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-275-3/+51
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix QXmlQuery autotest failure. Lower case as default in password entry in Symbian port. Fix for QTBUG-18050: QXmlQuery crash fix for QTBUG-18050: QXmlQuery crash
| | * | | | | | | 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
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-262-10/+21
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix plugin implicit loading when calling QPluginLoader::instance().
| | * | | | | | | | 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
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-233-10/+25
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian - perform some FS initialisation previously done by open c symbian - Document behaviour of QDir::rootPath / homePath
| | * | | | | | | | 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
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-09-231-1/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: The cursor can get offscreen in splitscreen landscape mode
| | * | | | | | | | 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
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-141-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: support the obj-c #import statement in the dependency generator
| * | | | | | | | | support the obj-c #import statement in the dependency generatorOswald Buddenhagen2011-10-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-21965 Reviewed-by: joerg
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-14303-398/+576
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Update 4.8.0 changelog Changelog: update changes-4.8.0 for Richard Add briefs for the new 4.8 examples. Add briefs to the new 4.8 demos. Add a brief to all demos and examples for manifest
| * | | | | | | | | Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-10-14403-3950/+6746
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-13321-4777/+9600
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (213 commits) Doc updates to Qt for Symbian installation instructions and platform notes. Doc updates to platform notes document. Fix accessible menu not returning child name. Fix broken qglthreads autotest build on Solaris. Doc updates to platform notes of Qt 4.8 doc. Disabled activeqt/webbrowser example from mingw build. Don't store the alignment attribute for spacers Doc updates to Qt 4.8 platform notes documentation. Update changelog for Qt-4.8.0: add QtWebKit notes Update changelog for Qt 4.8 Fix broken Solaris build (getpwnam_r usage) Improve sbsv2 whatlog support. Sentences should end with a period! (Poor man's rebuild trigger.) Update changes-4.8.0 file Modified SymSQL documentation in sql-driver.qdoc according review comments Added correct licence headers to symsql source files Documentation modifications for SymbianSQL added into sql-driver.qdoc Release Symbian SQL driver Fixed a typo found by static checker Added SQL driver plugin implementation for Symbian. ...
| | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/4.8'Casper van Donderen2011-09-30321-4777/+9600
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-09-271-2/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Update 4.8.0 changelog Changelog: update changes-4.8.0 for Richard
| | | * | | | | | | | | Update 4.8.0 changelogGabriel de Dietrich2011-09-161-0/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Changelog: update changes-4.8.0 for RichardRichard Moe Gustavsen2011-09-151-2/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-09-0112-18/+25
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Add briefs for the new 4.8 examples. Add briefs to the new 4.8 demos.
| | | * | | | | | | | | Add briefs for the new 4.8 examples.Casper van Donderen2011-09-016-6/+6
| | | | | | | | | | | |
| | | * | | | | | | | | Add briefs to the new 4.8 demos.Casper van Donderen2011-09-016-12/+19
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-09-01357-1365/+2437
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (26 commits) Add a brief to all demos and examples for manifest 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 Disable activeqt on win32-g++ (it doesn't build). fix warning remove unused functions Make the DBus timeout configurable in QDBusAbstractInterface. Fix a typo in qt-conf docs. Revert "Fix build with the Clang compiler" Added missing no_include_pwd check Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)' Fix build with the Clang compiler Change spacing of title in offline style. Add support for rawFonts loaded from data in FaceId examples: fix compilation with namespaced Qt. ...