summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fixed compiler warning about making the same class a friend twiceZeno Albisser2010-02-161-0/+2
* Fix a deadlock in kqueue implementation of QFileSystemWatcherBradley T. Hughes2010-02-161-4/+14
* Don't crash when QTouchEvent is accepted but not handled by aBradley T. Hughes2010-02-161-1/+8
* QNAM HTTP: Unify socket EOF handling a bitMarkus Goetz2010-02-162-24/+38
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-163-82/+84
|\
| * Replace the inline blend function by #defineBenjamin Poulain2010-02-151-67/+60
| * Fix for using QContiguousCache with default constructor or capacity=0Zeno Albisser2010-02-151-14/+21
| * Correctly mark QGraphicsScene::drawItems() as obsoleteAndy Shaw2010-02-151-1/+3
* | doc: Added \section1 about serializing operators for Qt collections.Martin Smith2010-02-161-0/+7
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-159-34/+326
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-129-34/+326
| |\
| | * Compile fix on Mac with 10.5 sdk.Denis Dzyubenko2010-02-121-1/+1
| | * QTestLib: don't crash if data tag requested, none availableJoão Abecasis2010-02-121-1/+13
| | * Implement the blend functions with SSE2Benjamin Poulain2010-02-123-13/+262
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-123-6/+33
| | |\
| | | * Ignore touch and gesture events when excluding input eventsDenis Dzyubenko2010-02-122-0/+19
| | | * Implemented GraphicsView Panel support for gestures.Denis Dzyubenko2010-02-121-6/+14
| | * | doc: Added some since version information.Martin Smith2010-02-121-13/+17
| | |/
| | * doc: Fixed several typos.Martin Smith2010-02-121-1/+1
* | | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
|/ /
* | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-1/+2
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-123-11/+8
|\ \ | |/ |/|
| * Fix to S60 softkeys when no active Qt window or native widget is shown.Janne Anttila2010-02-123-11/+8
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-124-4/+0
|\ \
| * | Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
* | | doc: Fixed several typos.Martin Smith2010-02-123-5/+5
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-112-13/+11
|\ \
| * | Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ...Simon Hausmann2010-02-111-3/+1
| * | QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| * | QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| |/
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-112-5/+0
|\ \ | |/ |/|
| * We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-111-1/+1
|\ \ | |/ |/|
| * QXmlSchema: fix crash in schema parserPeter Hartmann2010-02-111-1/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-113-2/+103
|\ \
| * | Update Symbian DEF filesIain2010-02-103-2/+103
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-112-27/+21
|\ \ \ | |_|/ |/| |
| * | Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."Bill King2010-02-111-27/+10
| * | Export a function to get dfb-surface from a pixmapAnders Bakken2010-02-101-0/+11
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-1016-4/+60
|\ \ \ | |_|/ |/| |
| * | Fix the WebKit buildSimon Hausmann2010-02-101-1/+1
| * | Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.Prasanth Ullattil2010-02-101-1/+5
| * | Fixed compilation with QT_NO_WHEELEVENTDenis Dzyubenko2010-02-1011-1/+36
| * | Take into account the solaris-cc-64-stlport mkspecPierre Rossi2010-02-101-1/+1
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-103-1/+18
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-102-18/+1
|\ \ \ | |_|/ |/| |
| * | License update as requested by legal for file relicensed from S60.Janne Anttila2010-02-101-17/+0
| * | Make compileThomas Zander2010-02-101-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-1025-108/+235
|\ \ \
| * | | Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.Trond Kjernåsen2010-02-101-1/+5