summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into refactorLars Knoll2011-05-1278-1609/+3259
|\
| * New algorithm for drawing thin linesLars Knoll2011-05-126-1449/+1137
| * Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-114-0/+20
| * Add the QIdentityProxyModel.Stephen Kelly2011-05-119-1/+1103
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1225-86/+786
| |\
| | * update def filesShane Kearns2011-05-116-51/+526
| | * emit QNetWorkAccessManager::finished on QNetworkReply::abort()Martin Petersson2011-05-111-0/+2
| | * Don't run XLib check if -no-gui is usedBernhard Rosenkraenzer2011-05-111-1/+1
| | * don't ignore create_prl for static pluginsOswald Buddenhagen2011-05-111-1/+1
| | * make QLibraryInfo return clean pathsOswald Buddenhagen2011-05-111-4/+6
| | * make relative paths in qt.conf work inside qmakeOswald Buddenhagen2011-05-111-1/+1
| | * Sockets: Fix potential null pointer usagesShane Kearns2011-05-112-8/+13
| | * QNAM: Re-order checks in migrateBackend()Markus Goetz2011-05-111-4/+4
| | * Fix initial main window dimensions for "fullscreen with softkeys" caseMiikka Heikkinen2011-05-111-0/+5
| | * Fix spelling mistakeShane Kearns2011-05-111-1/+1
| | * Fixes crash in QWidget::effectiveWinId.Bjørn Erik Nilsen2011-05-113-0/+46
| | * Fix crash when QSocketNotifier used with an invalid descriptorShane Kearns2011-05-113-1/+116
| | * Optimisation - buffer packet read in pendingDatagramSizeShane Kearns2011-05-112-9/+56
| | * Remove warnings when disabling notifications on a closed socketShane Kearns2011-05-111-6/+1
| | * Fix some warnings in symbian network testsShane Kearns2011-05-114-1/+9
| |/
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1120-53/+105
| |\
| | * Fix tst_QVariant::invalidColorJiang Jiang2011-05-111-1/+0
| | * Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-1117-47/+50
| | * Add some QRawFont related low level functions to avoid extra copyingJiang Jiang2011-05-112-5/+55
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-111-1/+1
| |\|
| | * Fix GLES2 include path for applications when not using the dash shellPaul Olav Tvete2011-05-111-1/+1
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-111-0/+1
| |\|
| | * Fix to commit 7fce0a73cc9b099c4ca67b3bc2e8bbe3060230c6.Kim Motoyoshi Kalland2011-05-111-0/+1
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-112-2/+2
| |\ \
| | * | tests: fixed or disabled qtbase tests with circular dependenciesRohan McGovern2011-05-112-2/+2
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-111-13/+19
| |\ \ \ | | | |/ | | |/|
| | * | Check if OES_texture_npot is present on OpenGL ES 2.Kim Motoyoshi Kalland2011-05-111-13/+19
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-111-22/+22
| |\ \ \ | | | |/ | | |/|
| | * | Fix a bug in syncqt.Liang Qi2011-05-111-22/+22
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1184-60/+192
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-111-0/+2
| |\ \ \
| * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-1112-0/+81
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Add QT_xxx_VERSION macros for each library in qtbaseLiang Qi2011-05-1012-0/+81
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-101-0/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-10155-2302/+3578
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-101-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-104-20/+260
| |\ \ \ \ \ \ \
* | | | | | | | | move files in src/gui into their final locationsLars Knoll2011-05-1182-101/+100
* | | | | | | | | No -rpath-link on Mac.Morten Sorvig2011-05-111-1/+1
* | | | | | | | | Deliver leave event to proper widget (not the top-level).Samuel Rødal2011-05-111-1/+2
* | | | | | | | | Improved popup and mouse event handling.Samuel Rødal2011-05-113-26/+117
* | | | | | | | | Compile fixes after merge.Samuel Rødal2011-05-112-4/+4
* | | | | | | | | Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-11339-9884/+7886
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | tests: fix private header inclusion in qtbase autotestsRohan McGovern2011-05-1162-38/+132
| * | | | | | | | tests: disable tests in qtbase which depend on qtsvgRohan McGovern2011-05-112-2/+3