Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change some examples of Webkit to create the mainwindow on the stack | Benjamin Poulain | 2009-12-14 | 3 | -6/+6 |
| | |||||
* | QNAM Code: Do not re-abort or continue processing notifications. | Markus Goetz | 2009-12-14 | 1 | -2/+2 |
| | | | | | | | This should finally enable us to use DirectConnection in QNetworkReplyHandler of QtWebKit. Reviewed-by: thiago | ||||
* | doc: Fixed erroneous qdoc error message. | Martin Smith | 2009-12-14 | 1 | -4/+1 |
| | | | | | | | qdoc reported a "No documentation" error for images used in examples, but these images aren't supposed to have documentation. Task-number: QTBUG-4484 | ||||
* | Merge commit '9aa60dfdf5b4837b9ceb15d8fcbc96f37dce7b5a' of Oslo-Staging-1 ↵ | Simon Hausmann | 2009-12-13 | 26 | -26/+584 |
|\ | | | | | | | into 4.6 | ||||
| * | Check if the timeout expired during the time update in qt_safe_select | Thiago Macieira | 2009-12-11 | 1 | -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. Hughes | 2009-12-11 | 3 | -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. Hughes | 2009-12-11 | 1 | -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 member | Anders Ahlen | 2009-12-11 | 1 | -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 McGovern | 2009-12-11 | 2 | -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 crash | Thiago Macieira | 2009-12-10 | 4 | -1/+273 |
| | | | | | | | | | | | | | | Also add an extensive autotest suite for QProcessEnvironment Task-number: QTBUG-6701 Reviewed-by: Markus Goetz | ||||
| * | Fixes a qfileinfo autotest. | Denis Dzyubenko | 2009-12-10 | 1 | -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 Macieira | 2009-12-10 | 1 | -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 Macieira | 2009-12-10 | 12 | -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 Dzyubenko | 2009-12-09 | 1 | -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 | ||||
* | | Add benchmark for QtScript translation functions. | Michael Brasser | 2009-12-11 | 1 | -0/+21 |
| | | |||||
* | | Fix translation context for qsTr. | Michael Brasser | 2009-12-10 | 1 | -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 McGovern | 2009-12-10 | 1 | -1/+4 |
| | | |||||
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Bill King | 2009-12-09 | 78 | -907/+2170 |
|\ \ | |||||
| * \ | Merge branch 'berlin-staging-2' into 4.6 | Joerg Bornemann | 2009-12-09 | 2 | -2/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | fix -nomake tools configure option for Windows CE / Symbian | Joerg Bornemann | 2009-12-07 | 1 | -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 Mobile | ninerider | 2009-11-23 | 1 | -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 | ||||
| * | | Merge commit 'origin/4.6' into 4.6-upstream | Bradley T. Hughes | 2009-12-09 | 13 | -71/+263 |
| |\ \ | |||||
| | * | | Mixed up top/bottom | Robert Griebl | 2009-12-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Reviewed-by: trustme | ||||
| | * | | Merge branch '4.5' into 4.6-staging | Thiago Macieira | 2009-12-08 | 2 | -6/+2 |
| | |\ \ | |||||
| | | * | | Fixed uninitialized background artifacts in QWidget::render. | Donald Carr | 2009-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backport of 64d38ba23b4acc46fdb9145f1953315573e3f8dc Reviewed-by: Anders Bakken<anders.bakken@nokia.com> | ||||
| | | * | | Fixed searching and copy/paste from PDF documents. | axis | 2009-12-08 | 1 | -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.5 | Jason McDonald | 2009-12-08 | 4 | -9/+8 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-12-01 | 2 | -3/+47 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-11-27 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-11-16 | 1 | -2/+2 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-11-15 | 1 | -9/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-11-13 | 4 | -15/+17 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-11-05 | 3 | -2/+34 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-11-04 | 2 | -8/+3 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-11-03 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-11-02 | 9 | -88/+167 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-30 | 3 | -40/+53 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-28 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-23 | 3 | -29/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-21 | 5 | -0/+178 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-19 | 4 | -5/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.5 | Jason McDonald | 2009-10-15 | 8 | -154/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-15 | 11 | -166/+80 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-13 | 2 | -1/+40 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-13 | 1 | -11/+11 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-12 | 8 | -21/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-07 | 8 | -15/+141 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-06 | 12 | -17/+142 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-05 | 3 | -31/+112 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Jason McDonald | 2009-10-05 | 4 | -0/+59 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |