summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-141-6/+6
|\ | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed spelling in docs
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-1417-14/+1065
| |\
| * | Fixed spelling in docsGunnar Sletta2009-12-141-6/+6
| | |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-138-12/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add benchmark for QtScript translation functions. Fix translation context for qsTr. Put symbian-specific test inside symbian qmake scope. Remove this unnecessary and verbose line. Proper fix for QTBUG-6421 fix -nomake tools configure option for Windows CE / Symbian Compilation fix for Windows Mobile
| * \ \ Merge commit '9aa60dfdf5b4837b9ceb15d8fcbc96f37dce7b5a' of Oslo-Staging-1 ↵Simon Hausmann2009-12-1326-26/+584
| |\ \ \ | | | | | | | | | | | | | | | into 4.6
| * | | | Add benchmark for QtScript translation functions.Michael Brasser2009-12-111-0/+21
| | | | |
| * | | | Fix translation context for qsTr.Michael Brasser2009-12-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the base of the file name as the translation context. (This was the original behavior before the switch to JSC.) Reviewed-by: Kent Hansen
| * | | | Put symbian-specific test inside symbian qmake scope.Rohan McGovern2009-12-101-1/+4
| | | | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-0978-907/+2170
| |\ \ \ \
| | * \ \ \ Merge branch 'berlin-staging-2' into 4.6Joerg Bornemann2009-12-092-2/+2
| | |\ \ \ \
| | | * | | | fix -nomake tools configure option for Windows CE / SymbianJoerg Bornemann2009-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lrelease must not be added to the subdirs project projects.pro when building Qt for Windows CE or Symbian. Reviewed-by: ossi
| | | * | | | Compilation fix for Windows Mobileninerider2009-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default style (plastique) used was not available if not included in the build. Using now the windows style instead. Reviewed-by: Maurice
| * | | | | | Remove this unnecessary and verbose line.Bill King2009-12-081-1/+0
| | | | | | |
| * | | | | | Proper fix for QTBUG-6421Bill King2009-12-072-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes setForwardOnly() for both OCI and SQLite Task-number: QTBUG-6421 Reviewed-by: Justin McPherson
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-1213-558/+1131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Update Polish translations Assistant: Add documentation for -remove-search-index. Designer: Handle "visible"-properties of item view headers correctly. Fix .gitignore to not ignore qdoc.pro Update polish translations Fix broken delete key, some cleanup. Assistant: Fix race condition in index creation. Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
| * | | | | | | Update Polish translationsJarek Kobus2009-12-112-49/+49
| | | | | | | |
| * | | | | | | Assistant: Add documentation for -remove-search-index.ck2009-12-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | | | | | Designer: Handle "visible"-properties of item view headers correctly.Friedemann Kleint2009-12-102-105/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the property sheet (isChanged/reset) correctly and do a hack for resetting the visibility. Task-number: QTBUG-6505 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
| * | | | | | | Fix .gitignore to not ignore qdoc.proHarald Fernengel2009-12-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an old ignore that was introduced before qdoc moved to $QTDIR/bin Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | | | Update polish translationsJarek Kobus2009-12-106-349/+917
| | | | | | | |
| * | | | | | | Fix broken delete key, some cleanup.kh12009-12-081-48/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | | | | | Assistant: Fix race condition in index creation.ck2009-12-081-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
| * | | | | | | Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the ↵Mikkel Krautz2009-12-071-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK to use. Merge-request: 2254 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-1139-97/+847
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) Check if the timeout expired during the time update in qt_safe_select Fix crashes when deleting QWidgets and QGraphicsItems in touch event handlers. Fix tst_QTouchEvent::touchUpdateAndEndNeverPropagate() Document QTextEncoder::fromUnicode as QT3 support member Install private headers when configuring Qt with -developer-build. Ensure that QProcessEnvironment::operator== doesn't crash Fixes a qfileinfo autotest. Fix compilation if QT_NO_DATESTRING is defined. Fix compilation: private headers must be #included with "" Use realpath() only on systems we know it works on. Mixed up top/bottom QGtkStyle: support for the inner-border property in GtkButtons Fixed uninitialized background artifacts in QWidget::render. Compile with -no-exceptions on Mac. Fixed searching and copy/paste from PDF documents. Autotest: ensure that QSharedPointer does proper autocasting through Compile on Windows CE. Add copyright header so the autotest will pass. Add support for the Selected QIcon::Mode when rendering the systray icon (Mac) Added a manual test for testing a z-order of overlapping widgets. ...
| * | | | | | Check if the timeout expired during the time update in qt_safe_selectThiago Macieira2009-12-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can happen that select(2) returns -1 with EINTR, but the time remaining was too small for us to update the time. Our own processing (plus the syscall to clock_gettime(2)) leads us past the timeout, so we get a negative timeval. Task-number: QTBUG-6755 Reviewed-by: Bradley T. Hughes
| * | | | | | Fix crashes when deleting QWidgets and QGraphicsItems in touch event handlers.Bradley T. Hughes2009-12-113-6/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QWeakPointer to bail out early if a widget is deleted while we are delivering/propagating a TouchBegin event. In QGraphicsScene, we need to make sure that we clear the scene's active touch points for items that are removed from the scene. This allows us to detect when an item is removed during TouchBegin event delivery/propagation. Unlike QWidget, propagation continues since we use a hit-test instead of the item's hierarchy for propagation. Task-number: QTBUG-6654 Reviewed-by: bnilsen
| * | | | | | Fix tst_QTouchEvent::touchUpdateAndEndNeverPropagate()Bradley T. Hughes2009-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGrahpicsItem behaves similarly to QWidget; if the TouchUpdate or TouchEnd event is ignored, then the event sent to the view and scene will also be ignored. Reviewed-by: Trust me
| * | | | | | Document QTextEncoder::fromUnicode as QT3 support memberAnders Ahlen2009-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make deprecated QTextEncoder::fromUnicode ( const QString & uc, int & lenInOut ) documented as QT3 support member Task-number: QTBUG-6614 Merge-request: 399 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | | | Install private headers when configuring Qt with -developer-build.Rohan McGovern2009-12-112-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many Qt autotests require both private symbols and private headers. Private symbols are turned on using -developer-build. However, prior to this commit there was no way to install private headers into the Qt install directory. This is particularly relevant for packaging systems which use `make install' to determine what should be packaged. For example, Qt for Maemo debian packages are effectively unusable for Qt autotests without this commit. Reviewed-by: Michael Goddard
| * | | | | | Ensure that QProcessEnvironment::operator== doesn't crashThiago Macieira2009-12-104-1/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add an extensive autotest suite for QProcessEnvironment Task-number: QTBUG-6701 Reviewed-by: Markus Goetz
| * | | | | | Fixes a qfileinfo autotest.Denis Dzyubenko2009-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canonical file paths can begin with slash only on unix platforms. Reviewed-by: Prasanth
| * | | | | | Fix compilation if QT_NO_DATESTRING is defined.Thiago Macieira2009-12-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have no string parsing in QDateTime, then we use sscanf, so we must include <stdio.h> Task-number: QTBUG-6668 Reviewed-by: Markus Goetz
| * | | | | | Fix compilation: private headers must be #included with ""Thiago Macieira2009-12-1012-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that the private headers don't exist in any of the -I lines, so they need to be found by the preprocessor relative to the source file, which means "". Task-number: QTBUG-6665 Reviewed-by: Trust Me
| * | | | | | Use realpath() only on systems we know it works on.Denis Dzyubenko2009-12-091-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use realpath(X,0) extension that is defined by the latest POSIX standard and not many systems support it at the moment. For now we limit it to Linux and Symbian. Mac supports it starting with 10.6, and we'll implement it properly for Mac in 4.7. We know that neither *BSD systems nor Solaris do not support it. Reviewed-by: Markus Goetz
| * | | | | Merge commit 'origin/4.6' into 4.6-upstreamBradley T. Hughes2009-12-0913-71/+263
| |\ \ \ \ \
| | * | | | | Mixed up top/bottomRobert Griebl2009-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-082-6/+2
| | |\ \ \ \ \
| | | * | | | | Fixed uninitialized background artifacts in QWidget::render.Donald Carr2009-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backport of 64d38ba23b4acc46fdb9145f1953315573e3f8dc Reviewed-by: Anders Bakken<anders.bakken@nokia.com>
| | | * | | | | Fixed searching and copy/paste from PDF documents.axis2009-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously copy and paste from PDFs made by Qt would paste garbage into the target document, and searching was not possible. The bug happened because the internal buffer would open its data stream in truncate mode rather than append mode, thereby losing content, and producing a slightly corrupted PDF. Task: QTBUG-4912 Task: QTBUG-3661 RevBy: Trond Kjernåsen (cherry picked from commit f7ee0c9efcb6cb36a95f49bc998524e25480f8ba)
| | | * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-12-084-9/+8
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-12-012-3/+47
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-11-271-1/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-11-161-2/+2
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-11-151-9/+1
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-11-134-15/+17
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-11-053-2/+34
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-11-042-8/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-11-031-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-11-029-88/+167
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-10-303-40/+53
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \