summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-11-298-4/+28
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-11-280-0/+0
| |\ | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-11-271475-35811/+13533
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (189 commits) Added missing license header. Adjust pathes once again. Fixed a link Fixed a link Split behavior and wigglytext examples Rename files to show up in docs. Whitespace changes and added depends. Fix up examples. Fixed some linking issues. Removed unecessary files from folders. Fixes for the manifest and links. Changed some of the short descriptions for WebView examples. Removed unecessary duplicate files. Symbian-linux crosscompilation case changes Fix link to WebView examples. Fix link to ListView and WebView example pages. Fixed lists to be ordered lists and added curly brackets Change the links to behavior examples. Fix warning about unbalanced parantheses. Fix abstractitemmodel compilation error. ...
| | | * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-11-261475-35811/+13533
| | | |\
| | * | \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-11-261669-67604/+83753
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (675 commits) Fix QDateEdit calendar pop-up having wrong date Repaint QProgressBar when minimum or maximum changed Fix QProgressBar causing timer event spam Fix memory leak in QCursorData fix gdb_dwarf_index.prf for applications, take two Compile fix for Mac OS X 10.7 with 10.6 sdk Update supported platforms and remove commercial page. networking: regenerate effective TLD table for cookies fix gdb_dwarf_index.prf for executables WINSCW def file update so that qtgui can pick up virtual from qtcore Add mobile-reduced ts-files for Symbian. Create cleanup stack in idleDetectorThread Preventing zero-timer lockups when Symbian's active scheduler used QNAM: Fix authentication cache when the password is in the URL Qt Designer: Fix static linking on Mac. SSL: blacklist intermediate certificates that issued weak certs Fix memory leak in S60Style Fix to QtOpenGL crash on Symbian Give better error message when using unsupported lookbehinds in QRegExp Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT ...
| | | * | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-11-12717-54850/+43172
| | | |\ \
| | | * \ \ Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-10-031116-16495/+49318
| | | |\ \ \
| * | | \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-282-0/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: SSL: fix build when compiled with -openssl-linked
| | * | | | | | SSL: fix build when compiled with -openssl-linkedPeter Hartmann2011-11-282-0/+12
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and only resolve the functions when the methods are available. SSL 2 functionality is not always available in OpenSSL anymore. Change-Id: Ia3178685b26c67ac55447476789e06710b596181 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit 09404c072fec2e195d8114dc4d95ce3683c341cf)
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-286-4/+16
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: New API to set AVKON flag to inputcontext in Qt/Symbian. Fixing memory leak in QtGui qt_cleanup
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-256-4/+16
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: New API to set AVKON flag to inputcontext in Qt/Symbian. Fixing memory leak in QtGui qt_cleanup
| | | * \ \ \ \ Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-255-1/+16
| | | |\ \ \ \ \
| | | | * | | | | New API to set AVKON flag to inputcontext in Qt/Symbian.Satyam Bandarapu2011-11-255-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This API is to pass any AVKON FEP flag to QCoeFepInputContext. Implemented as an exported private API, which is available only in Qt/Symbian. If latin keyboard flag is passed to this API and editor is Email/Url, virtual keyboard launches always with latin characters regardless of input language. Reviewed by: Sami Merila
| | | * | | | | | Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-251-3/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Fixing memory leak in QtGui qt_cleanupJani Hyvonen2011-11-221-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In qt_cleanup() the S60->setButtonGroupContainer(0) - which sets the QS60Data::cba to zero - is called before calling delete S60->buttonGroupContainer(). Because of this the currently set QS60Data::cba gets never deleted. A call S60->setButtonGroupContainer(0) which sets the QS60Data::cba pointer to zero is now called after calling the delete S60->buttonGroupContainer(). Task-number: QTBUG-22741 Reviewed-by: Murray Read
* | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-2718-44/+44
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-11-2614-17/+17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: Doc: Fixing typo
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-2614-17/+17
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | _ / / / | | | | | | / / /
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-2214-17/+17
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Doc: Fixing typo
| | | * | | | | | Doc: Fixing typoSergio Ahumada2011-08-1714-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reducing the amount of spelling errors from NBN. Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86 Reviewed-by: Rohan McGovern
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-254-27/+27
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian-linux crosscompilation case changes Symbian-linux crosscompilation debug-release align
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-243-26/+26
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian-linux crosscompilation case changes
| | | * | | | | | Symbian-linux crosscompilation case changesPasi Pentikainen2011-11-243-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the cases to match actual files in Symbian, and add EPOCROOT prefixes to data files in iby. Reviewed-by: Juha Kukkonen Task-number: QTBUG-14361
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-241-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian-linux crosscompilation debug-release align
| | | * | | | | | Symbian-linux crosscompilation debug-release alignPasi Pentikainen2011-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the Symbian Raptor configure options to use debug variant when using configure-sh on linux crosscompilation, so that it matches with result of configure.exe on windows. Reviewed-by: Miikka Heikkinen Task-number: QTBUG-14361
* | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-26248-5152/+266
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-11-25248-5152/+266
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (23 commits) Added missing license header. Adjust pathes once again. Fixed a link Fixed a link Split behavior and wigglytext examples Rename files to show up in docs. Whitespace changes and added depends. Fix up examples. Fixed some linking issues. Removed unecessary files from folders. Fixes for the manifest and links. Changed some of the short descriptions for WebView examples. Removed unecessary duplicate files. Fix link to WebView examples. Fix link to ListView and WebView example pages. Fixed lists to be ordered lists and added curly brackets Change the links to behavior examples. Fix warning about unbalanced parantheses. Fix abstractitemmodel compilation error. Split ListView and WebView examples. ...
| | * | | | | | | | Added missing license header.Rohan McGovern2011-11-251-0/+40
| | | | | | | | | |
| | * | | | | | | | Adjust pathes once again.Daniel Molkentin2011-11-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | | | | Fixed a linkKevin Wright2011-11-241-1/+1
| | | | | | | | | |
| | * | | | | | | | Fixed a linkKevin Wright2011-11-241-1/+1
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-249-0/+10
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Rename files to show up in docs.Casper van Donderen2011-11-249-0/+10
| | | | | | | | | | |
| | * | | | | | | | | Split behavior and wigglytext examplesKevin Wright2011-11-248-0/+214
| | |/ / / / / / / /
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-24175-2955/+49
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix up examples.Daniel Molkentin2011-11-24175-2955/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove dependencies from examples - Remove stray copies of qtc_packaging - remove .desktop files - rename examples (to their old name) Reviewed-By: Casper van Donderen
| | * | | | | | | | | Whitespace changes and added depends.Kevin Wright2011-11-241-5/+5
| | |/ / / / / / / /
| | * | | | | | | | Fixed some linking issues.Kevin Wright2011-11-242-2/+5
| | | | | | | | | |
| | * | | | | | | | Removed unecessary files from folders.Kevin Wright2011-11-2416-532/+0
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-2429-1701/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Changed some of the short descriptions for WebView examples.Kevin Wright2011-11-241-3/+3
| | | | | | | | | | |
| | | * | | | | | | | Removed unecessary duplicate files.Kevin Wright2011-11-2429-1698/+2
| | | | | | | | | | |
| | * | | | | | | | | Fixes for the manifest and links.Casper van Donderen2011-11-242-9/+7
| | |/ / / / / / / /
| | * | | | | | | | Fix link to WebView examples.Casper van Donderen2011-11-241-9/+10
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-241-13/+16
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixed lists to be ordered lists and added curly bracketsKevin Wright2011-11-241-13/+16
| | | | | | | | | | |
| | * | | | | | | | | Fix link to ListView and WebView example pages.Casper van Donderen2011-11-241-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Change the links to behavior examples.Casper van Donderen2011-11-242-2/+2
| | |/ / / / / / / /
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-243-11/+4
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix warning about unbalanced parantheses.Daniel Molkentin2011-11-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Robert Loehning