summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-3013-67/+294
|\
| * Skip tst_QFont::lastResortFont() for Q_WS_QWSAlessandro Portale2010-09-291-0/+5
| * Fixed failure of benchlibcallgrind selftest on some platforms.Rohan McGovern2010-09-291-6/+16
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-2812-61/+273
| |\ |/ /
| * Fix QFontMetrics::lineWidth() for fonts with defined point sizeAlessandro Portale2010-09-282-1/+25
| * Implemeting, exporting and autotesting QFont::lastResortFont()Alessandro Portale2010-09-284-0/+19
| * Fixed compile error on non-Symbian platforms.axis2010-09-281-0/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-276-61/+228
| |\
| | * Fixed regression when typing in QTextControl based widgets on Symbianaxis2010-09-272-55/+208
| | * Fixed incorrect snippet in BLD_INF_RULES documentationMiikka Heikkinen2010-09-272-1/+8
| | * Streamlined smart installer package creationMiikka Heikkinen2010-09-272-5/+12
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-2857-4653/+861
|\ \ \ | |/ / |/| |
| * | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| * | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-09-281-0/+3
| |\ \
| | * | Doc: Fixing QTBUG-13595Morten Engvoldsen2010-09-281-0/+3
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2722-57/+220
| | |\ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-2857-4653/+819
| |\ \ \ |/ / / /
| * | | Fix compile warnings (unused variables).Aaron McCarthy2010-09-282-1/+9
| * | | Removing libconninet 3rdparty component.Aaron McCarthy2010-09-2843-4595/+650
| * | | Closes properly the dbus connection in icd backendAaron McCarthy2010-09-281-0/+2
| * | | Connect/Disconnect requests needs to use the same dbus connection to ICD for ...Aaron McCarthy2010-09-282-5/+6
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-2713-52/+152
| |\ \ \
| | * | | Added my changes to the changelog.axis2010-09-271-0/+12
| | * | | Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-2714-11/+164
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-265-55/+71
| | |\ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2495-501/+1824
| | |\ \ \ \
| | * | | | | Clarified documentation of loadFinished() signal.Jerome Pasion2010-09-241-5/+7
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-242-0/+13
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2474-470/+655
| | | |\ \ \ \ \
| | | * | | | | | Doc: call qApp->precessEvents after QSplashScreen::showMessageGeir Vattekar2010-09-241-0/+7
| | | * | | | | | Doc: Said that QApplication exits when not able to open X11 displayGeir Vattekar2010-09-241-0/+6
| | * | | | | | | Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-233-28/+28
| | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2271-442/+627
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-228-13/+46
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-218-13/+46
| | | |\ \ \ \ \ \
| | * | | | | | | | Doc: Added a note to qmake INSTALLS docsGeir Vattekar2010-09-221-0/+3
| | |/ / / / / / /
| | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2152-802/+12445
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2050-799/+12440
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'doc-4.7' into 4.7Morten Engvoldsen2010-09-201-3/+4
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'doc-4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-201-3/+4
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch 'doc-4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Jerome Pasion2010-09-20364-4131/+3265
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Added default value documentation for two variables.Jerome Pasion2010-09-171-3/+4
| | | * | | | | | | | | | | Doc: Fixing overlapping text problem in columnsMorten Engvoldsen2010-09-201-0/+1
| | | |/ / / / / / / / / /
| | * | | | | | | | | | | Doc: Added info on QWidget::render to printing docsGeir Vattekar2010-09-202-0/+65
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-272-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add export to QDeclarativeBasePositionerMarco Bubke2010-09-271-1/+1
| * | | | | | | | | | | Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-271-0/+1
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-276-45/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Moved the partial deployment section to qbase.pri.axis2010-09-274-45/+17