summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-02110-1671/+4581
|\
| * Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774Simon Hausmann2010-04-307-3/+87
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-30107-1671/+4497
| |\
| | * Updated WebKit to 2c346f58ae70470d88dcd856bfe59b04a144b65aSimon Hausmann2010-04-304-32/+73
| | * Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3Simon Hausmann2010-04-296-10/+31
| | * Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9dSimon Hausmann2010-04-299-74/+174
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-28107-1578/+4242
| | |\
| | | * Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27Simon Hausmann2010-04-28107-1578/+4242
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-0283-1976/+3467
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-3083-1976/+3467
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | bye bye QMakeProjectEnvOswald Buddenhagen2010-04-302-51/+5
| | * | | short-cut evaluation inside if() testsOswald Buddenhagen2010-04-301-6/+3
| | * | | eliminate special splitting of INCLUDEPATH and DEPENDPATHOswald Buddenhagen2010-04-301-5/+3
| | * | | do not env-expand cache file pathOswald Buddenhagen2010-04-301-1/+1
| | * | | s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/Oswald Buddenhagen2010-04-301-1/+1
| | * | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-04-301-2/+2
| | * | | s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/Oswald Buddenhagen2010-04-3050-50/+50
| | * | | teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)Oswald Buddenhagen2010-04-301-8/+7
| | * | | warn about usage of deprecated variablesOswald Buddenhagen2010-04-301-0/+5
| | * | | warn about using non-lowercased replace $$function()sOswald Buddenhagen2010-04-301-1/+5
| | * | | add -Wdeprecated option (on by default)Oswald Buddenhagen2010-04-302-3/+8
| | * | | make QMakeProject::isEmpty() consider legacy mappingsOswald Buddenhagen2010-04-302-3/+6
| | * | | document some functions' scopeOswald Buddenhagen2010-04-301-5/+5
| | * | | fix $$size() not using function-scoped variablesOswald Buddenhagen2010-04-301-2/+1
| | * | | doc: Fixed some qdoc errors.Martin Smith2010-04-303-14/+2
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-304-122/+220
| | |\ \ \
| | | * | | Autotest: check that we receive key events on toplevel widgetsRichard Moe Gustavsen2010-04-302-8/+58
| | | * | | Cocoa: key events stopped workingRichard Moe Gustavsen2010-04-301-0/+6
| | | * | | Update Polish translationsJarek Kobus2010-04-301-114/+156
| | * | | | qdoc: Added breadcrumbs for namespaces.Martin Smith2010-04-302-3/+7
| | |/ / /
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-3011-1692/+3062
| | |\ \ \
| | | * | | French translation strings, originally made by external translators.Pierre Rossi2010-04-291-1674/+2976
| | | * | | Set the enabled state on the page when changing the QTabWidgetKevin Ottens2010-04-292-3/+8
| | | * | | add QString::setRawData() and revive QByteArray::setRawData()Oswald Buddenhagen2010-04-294-10/+73
| | | * | | Backport a fix to Designer filterwidgetJens Bache-Wiig2010-04-292-3/+3
| | | * | | Added wildcards to allow custom mkspecs namesConstantin Makshin2010-04-292-2/+2
| | * | | | qdoc: Added "All namespaces" to the API Lookup box.Martin Smith2010-04-301-0/+1
| | |/ / /
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-292-0/+18
| | |\ \ \
| | | * | | add some QNetworkCookieJar testsPeter Hartmann2010-04-281-0/+3
| | | * | | Secure Cookies should only be sent over secure connections.Robert Hogan2010-04-282-0/+15
| | * | | | qdoc: Added breadcrumbs to examples. Coolio.Martin Smith2010-04-293-0/+37
| | |/ / /
| | * | | qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-282-9/+20
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-0216-26/+360
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-3016-26/+360
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix desktopservices demo missing icon in SymbianMiikka Heikkinen2010-04-301-1/+5
| | * | | | Fix path removal from target in Symbian buildsMiikka Heikkinen2010-04-301-3/+6
| | * | | | Fix compilation errors in tst_qfileinfoShane Kearns2010-04-291-3/+3
| | * | | | Symbian (installation) docs.Thomas Zander2010-04-292-2/+287
| | * | | | Make 'make sis' recursive again.Thomas Zander2010-04-291-1/+1
| | * | | | Fix libinfix usageThomas Zander2010-04-291-2/+1