summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj filesAndy Shaw2009-12-162-2/+5
| | | | | | | | RevBy: Marius SO Details: It worked fine for Makefiles since no checking is done of the flags. Now its fixed so it works for vcproj files too making it easier for people to build 64bit targets in Visual Studio.
* Revert "Changes to support locale change event for symbian platform"Denis Dzyubenko2009-12-168-181/+17
| | | | | | Revert a change that is not yet complete and was pushed by mistake. This reverts commit 44f7c1e097582a704a06ccbbf516536b88ddcd3a.
* Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-155-1/+47
|\ | | | | | | | | Conflicts: mkspecs/macx-g++40/qplatformdefs.h
| * Add a mkspec for selecting gcc-4.0 on Mac OS X.Morten Sorvig2009-12-114-0/+190
| | | | | | | | | | This has one known use case: compiling with the 10.4u SDKi on 10.6. (cherry picked from commit 855f1705ceb15c303b55fcced8b0303d90352a44)
| * Fix crash in QFontDialog::getFont() on Mac 10.4Morten Johan Sørvig2009-12-101-0/+4
| | | | | | | | | | | | [NSFontManager setTarget] is not available on 10.4. Rev-by: Richard Moe Gustavsen
| * Fix crash in QDBusPendingReply/QDBusReply in case of unconnected calls.Thiago Macieira2009-12-094-1/+43
| | | | | | | | | | | | | | | | If we made calls on a QDBusConnection that isn't connected, the d pointer is 0. Ensure we don't crash. Task-number: QTBUG-6571 Reviewed-by: Bradley T. Hughes
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-1520-59/+281
|\ \
| * | Calling removeToolBar() on native Mac toolbars (Cocoa) causes crash.Prasanth Ullattil2009-12-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The hash and the list which stores the references are already cleared by the delegate function toolbarDidRemoveItem: There is no need to remove them manually after a call to [NSToolbar removeItemAtIndex]. Task-number: QTBUG-6200 Reviewed-by: Richard Moe Gustavsen
| * | Allow the WM_TASKBARCREATED message through the UIPI filter on Windows Vista ↵miniak2009-12-151-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and higher This is necessary to allow Windows Explorer send the WM_TASKBARCREATED message to a Qt application (to recreate its QSystemTrayIcon-s) even when it is running in a higher UIPI privilege level. Merge-request: 1626 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| * | Changes to support locale change event for symbian platformdka2009-12-158-17/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subscribing to the locale change notification to be able to update the system locale whenever the user changes the current system locale. Also changed the initialization of the system locale to make construction of the QLocale object as lightweight as possible. So now the default contructor just creates a QLocale and QSystemLocale objects, but doesn't try to fill the cache in the latter with data from the system and postpones it until it is actually requested (most applications create QLocale objects on the stack and might not even use the data from the system locale, so we don't need to initialize system locale right away). Modified-by: axis Modified-by: Denis Dzyubenko Reviewed-by: Denis Dzyubenko Reviewed-by: axis
| * | Optimisations to gesture event filtering.Denis Dzyubenko2009-12-153-28/+64
| | | | | | | | | | | | | | | | | | | | | Now we don't filter some events through the gesture manager and use QMap instead of QHash, which seem to be a bit faster in our cases. Reviewed-by: Olivier Goffart
| * | Fix compilation on HP-UX 11.11.Tristan Chabredier2009-12-153-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was: thread/qthread_unix.cpp: In static member function 'static int QThread::idealThreadCount()': thread/qthread_unix.cpp:325: error: aggregate 'pst_dynamic psd' has incomplete type and cannot be defined thread/qthread_unix.cpp:326: error: 'pstat_getdynamic' was not declared in this scope Task-number: QTBUG-6576 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Change some examples of Webkit to create the mainwindow on the stackBenjamin Poulain2009-12-143-6/+6
| | |
| * | QNAM Code: Do not re-abort or continue processing notifications.Markus Goetz2009-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | This should finally enable us to use DirectConnection in QNetworkReplyHandler of QtWebKit. Reviewed-by: thiago
* | | doc: Final fix. Example image links now display the image.Martin Smith2009-12-153-1/+47
|/ / | | | | | | Task-number: QTBUG-4484
* | doc: Fixed erroneous qdoc error message.Martin Smith2009-12-141-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 Hausmann2009-12-1326-26/+584
|\ \ | | | | | | | | | into 4.6
| * | 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
* | | 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
| * | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \