summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-16467-8867/+19403
|\ | | | | | | | | Conflicts: tools/qdoc3/test/qt.qdocconf
| * Do not crash if addrinfo signal does not contain ip address information.Jukka Rissanen2010-07-161-0/+3
| | | | | | | | | | Fixes: NB#176643 - Segmentation fault occurs while using networking Reviewed-by: Adrian Constantin
| * Link to the unsinstalled libraries first.Petri Latvala2010-07-161-1/+1
| | | | | | | | | | Task-number: QT-3371 Reviewed-by: Harald Fernengel
| * Revert the change in applicationShouldTerminate().Fabien Freling2010-07-161-1/+0
| | | | | | | | | | | | | | | | | | | | It used to fix an issue during logout but it seems to be fine now. Related issue: QTBUG-6296 Task-number: QTBUG-10993 Reviewed-by: Morten Sorvig
| * Added LatinAmericaAndTheCaribbean country to the doc.Denis Dzyubenko2010-07-161-0/+1
| | | | | | | | | | Task-number: QTBUG-12063 Reviewed-by: trustme
| * Network Proxy Query: Fix memleak on OS XMarkus Goetz2010-07-161-1/+4
| | | | | | | | Task-number: QTBUG-12106
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-16101-855/+1920
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-16156-2375/+3012
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (104 commits) Fixed tst_maketestselftest::tests_pro_files failure remove nasty hack by using a stricter regexp (for language codes) cosmetics: quote the dot in the regexp remove dependency of ts targets on sub-tools add commit-ts target to commit ts files without line number info (re-)add 'untranslated' ts targets more fine-grained ts targets split qt_help out into an own ts target Unbreak the Maemo 5 build after the Symbian fix QNAM HTTP: Fix problem with cached files and metaDataChanged() Add a testcase for QTBUG-11213 to prevent future regressions. Autotest: reenable the NTLM proxy test on tst_QTcpSocket Autotest: add a small, boring test for QAuthenticator Add documentation for the QAuthenticator options. Expose the QAuthenticator map of options in the API. Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC" Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa Add unit tests for QMimeData. fix qconfig.h reference for shadow builds ...
| | | * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-07-1614-13/+131
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| | | * | Fixed tst_maketestselftest::tests_pro_files failureRohan McGovern2010-07-151-0/+2
| | | | | | | | | | | | | | | | | | | | Add qauthenticator to tests/auto/network.pro
| | | * | remove nasty hack by using a stricter regexp (for language codes)Oswald Buddenhagen2010-07-151-7/+2
| | | | |
| | | * | cosmetics: quote the dot in the regexpOswald Buddenhagen2010-07-151-1/+1
| | | | |
| | | * | remove dependency of ts targets on sub-toolsOswald Buddenhagen2010-07-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is pretty pointless, really. these are manual targets, so if they fail because of missing tools, the user can just make sub-tools manually. way better than wasting time waiting for make to run through the whole qt tree each time.
| | | * | add commit-ts target to commit ts files without line number infoOswald Buddenhagen2010-07-151-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is pretty pointless to commit the extracted line number information, as it needs to be refreshed after pulling source code changes anyway. on top of it, it bloats the repository.
| | | * | (re-)add 'untranslated' ts targetsOswald Buddenhagen2010-07-153-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | these files are not meant for commit, but it's good to have a quick way to create templates.
| | | * | more fine-grained ts targetsOswald Buddenhagen2010-07-157-143/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there are now per-language ts-<package>-<lang> and ts-<lang> targets to update only the files relevant for a given language. there is also a ts-all target which does what the old ts target did. the ts-<package> targets are now named ts-<package>-all and should not be used manually - they exist for the convenience of the ts-all target. the ts target is now only a help blurb.
| | | * | split qt_help out into an own ts targetOswald Buddenhagen2010-07-151-5/+9
| | | | | | | | | | | | | | | | | | | | the combined target would be too hard to transform in the next commit
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-15155-2287/+2993
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (96 commits) Unbreak the Maemo 5 build after the Symbian fix QNAM HTTP: Fix problem with cached files and metaDataChanged() Add a testcase for QTBUG-11213 to prevent future regressions. Autotest: reenable the NTLM proxy test on tst_QTcpSocket Autotest: add a small, boring test for QAuthenticator Add documentation for the QAuthenticator options. Expose the QAuthenticator map of options in the API. Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC" Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa Add unit tests for QMimeData. fix qconfig.h reference for shadow builds Drag and drop cursor doesnot change on invalid drop areas (Cocoa) Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa fix qconfig.h aliased header creation fix warning directive on gnuc qdoc: Removed navigation arrow that was causing display problems. Silence warning when building with MSVC 2005 Fix an Assert in QTextTable Revert "Fix an Assert in QTextTable" ...
| | | | * | Unbreak the Maemo 5 build after the Symbian fixHarald Fernengel2010-07-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Robert Griebl
| | | | * | QNAM HTTP: Fix problem with cached files and metaDataChanged()Markus Goetz2010-07-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | | | * | Add a testcase for QTBUG-11213 to prevent future regressions.Robin Burchell2010-07-155-3/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2427 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| | | | * | Autotest: reenable the NTLM proxy test on tst_QTcpSocketThiago Macieira2010-07-151-2/+2
| | | | | |
| | | | * | Autotest: add a small, boring test for QAuthenticatorThiago Macieira2010-07-153-1/+161
| | | | | |
| | | | * | Add documentation for the QAuthenticator options.Thiago Macieira2010-07-151-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3573 Reviewed-by: Markus Goetz
| | | | * | Expose the QAuthenticator map of options in the API.Thiago Macieira2010-07-153-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3573 Reviewed-By: Markus Goetz
| | | | * | Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeaderThiago Macieira2010-07-153-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| | | | * | Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC"Oswald Buddenhagen2010-07-153-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a9c8decc741d8c2b340f38d7a854ef206672ab3e. Postponed for Qt5. Or different makespecs.
| | | | * | Fix for tst_qmdisubwindow::fixedMinMaxSize failure on CocoaPrasanth Ullattil2010-07-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to respect the size restrictions for all QWidgets. Previously this was only applied to top levels. Reviewed-by: Bradley T. Hughes
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-15144-2252/+2566
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (86 commits) Add unit tests for QMimeData. fix qconfig.h reference for shadow builds Drag and drop cursor doesnot change on invalid drop areas (Cocoa) Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa fix qconfig.h aliased header creation fix warning directive on gnuc qdoc: Removed navigation arrow that was causing display problems. Silence warning when building with MSVC 2005 Fix an Assert in QTextTable Revert "Fix an Assert in QTextTable" Attempt to fix build failure with msvc200{5,8} on Windows XP. fix macx not having UNICODE in DEFINES any more doc: Fixed several qdoc warnings. Fix an Assert in QTextTable doc: Fixed several qdoc warnings. QSslSocket: Improve error handling qdoc: Fixed several <div> elements that had the "/>" ending. QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode() qdoc: Fixed breadcrumbs for QML examples. remove redundand translations project files ...
| | * | | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1653-595/+1282
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix .pro file Add files missing from last commit fix doc link Add chapter on creating list property types fix spelling Change tutorial from using "Musician" etc. types to using "PieChart" Text element does not clip even with clip=true
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1553-595/+1282
| | | |\ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix .pro file Add files missing from last commit fix doc link Add chapter on creating list property types fix spelling Change tutorial from using "Musician" etc. types to using "PieChart" Text element does not clip even with clip=true
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1553-595/+1282
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix .pro file Add files missing from last commit fix doc link Add chapter on creating list property types fix spelling Change tutorial from using "Musician" etc. types to using "PieChart" Text element does not clip even with clip=true
| | | | * | | Fix .pro fileBea Lam2010-07-151-1/+2
| | | | | | |
| | | | * | | Add files missing from last commitBea Lam2010-07-157-0/+446
| | | | | | |
| | | | * | | fix doc linkBea Lam2010-07-151-1/+1
| | | | | | |
| | | | * | | Add chapter on creating list property typesBea Lam2010-07-1515-51/+136
| | | | | | |
| | | | * | | fix spellingBea Lam2010-07-151-1/+1
| | | | | | |
| | | | * | | Change tutorial from using "Musician" etc. types to using "PieChart"Bea Lam2010-07-1534-503/+652
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | etc. types to make a more practical example that shows how to do painting as well. Also includes some tutorial improvments.
| | | | * | | Text element does not clip even with clip=trueYann Bodson2010-07-152-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-12201 Reviewed-by: Michael Brasser
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-1514-13/+131
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QFileDialog : Fix completer showing up on the MyComputer view. Amend previous commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf to fix compilation with QT_NO_DEBUG_STREAM Compile with QT_NO_DEBUG_STREAM Docs: HTML comments marks so Creator can extract data efficiently. Work around memory leak issue in grid and linear layouts.
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-1514-13/+131
| | | |\ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QFileDialog : Fix completer showing up on the MyComputer view. Amend previous commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf to fix compilation with QT_NO_DEBUG_STREAM Compile with QT_NO_DEBUG_STREAM Docs: HTML comments marks so Creator can extract data efficiently. Work around memory leak issue in grid and linear layouts.
| | | * | | | QFileDialog : Fix completer showing up on the MyComputer view.Alexis Menard2010-07-152-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only complete if there is a text to complete Reviewed-by:janarve
| | | * | | | Amend previous commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf to fix ↵Olivier Goffart2010-07-154-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compilation with QT_NO_DEBUG_STREAM Qt in debug need to stay binary compatible with Qt in release. See also commit cbbd7e084c7e46fd906db26b13032b8368c59093 that introduced the problem Task-number: QTBUG-11510
| | | * | | | Compile with QT_NO_DEBUG_STREAMOlivier Goffart2010-07-144-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11510
| | | * | | | Docs: HTML comments marks so Creator can extract data efficiently.Leandro Melo2010-07-144-1/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Smith
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-07-1435-427/+711
| | | |\ \ \ \
| | | * | | | | Work around memory leak issue in grid and linear layouts.Andreas Aardal Hanssen2010-07-144-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These classes create a new QWidget and assign it to a static pointer which is never cleaned up. Using Q_GLOBAL_STATIC ensures that they are deleted on library unload. This is really just a cosmetic change that removes a leak warning - the real fix should be to find a way to not use a new QWidget like this. It seems odd that QGraphicsLayouts, which don't use QWidget in any other way, should depend on QWidget like this. Task-number: QTBUG-10768 Merge-request: 741 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-154-108/+22
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: fix for looping crash log on data abort Allow commenting of individual files in generated pkg files. Removed README.s60-mkspec. Fixed install docs for Qt for Symbian on Linux.
| | | * | | | | fix for looping crash log on data abortShane Kearns2010-07-151-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a thread panics, calling resume allows the thread to proceed to the exit handler and shut down. When a thread takes an exception, calling resume continues from the same point so the exception happens again. To avoid this, we add crashed thread ids to a list. If we see the same thread crash again, we terminate the process without trying to fetch the call stack a second time. Reviewed-by: Jason Barron
| | | * | | | | Allow commenting of individual files in generated pkg files.axis2010-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Jason Barron