summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-261-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-01-2010543-17211/+24497
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-03-16113-0/+6034
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Temporarily removed Harmattan specific patchesEckhart Koppen2011-03-1615-2232/+0
| * | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-03-14128-0/+8266
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Harmattan: fixed license headers.Rohan McGovern2011-03-148-32/+295
| | * | | | | | | | | | | | | | | | | Added Harmattan specific debian files to master branch.Janne Hamalainen2011-03-10128-0/+8003
* | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-1655-2906/+1914
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge earth-team into masterOlivier Goffart2011-03-1555-2906/+1914
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | SSL: give protocol enum SecureProtocols an own valuePeter Hartmann2011-03-154-6/+8
| | * | | | | | | | | | | | | | | | | | QMAKE: Fix post build events for VS2010Martin Petersson2011-03-151-3/+8
| | * | | | | | | | | | | | | | | | | | SSL backend: avoid setting SNI hostname for old SSL versionsPeter Hartmann2011-03-142-2/+5
| | * | | | | | | | | | | | | | | | | | SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3)Peter Hartmann2011-03-146-8/+23
| | * | | | | | | | | | | | | | | | | | SSL: introduce new option TlsV1SslV3 for SSL communicationPeter Hartmann2011-03-144-31/+130
| | * | | | | | | | | | | | | | | | | | Mac Style: Compile FixMartin Petersson2011-03-141-1/+1
| | * | | | | | | | | | | | | | | | | | Mac: Center the Window title on Cocoa.Martin Petersson2011-03-101-0/+2
| | * | | | | | | | | | | | | | | | | | Fix corner of scroll area so it is stylable on Mac.Martin Petersson2011-03-101-1/+1
| | * | | | | | | | | | | | | | | | | | QNAM HTTP: Pair channels with requests at a later state.Martin Petersson2011-03-103-24/+48
| | * | | | | | | | | | | | | | | | | | tst_qnetworkreply: fix MiniHttpServer crashMartin Petersson2011-03-101-1/+0
| | * | | | | | | | | | | | | | | | | | Windows: Activate the context menu on tray icons when shown.Martin Petersson2011-03-101-0/+1
| | * | | | | | | | | | | | | | | | | | SSL backend: check at runtime for the right OpenSSL version for SNIPeter Hartmann2011-03-044-3/+9
| | * | | | | | | | | | | | | | | | | | QNAM HTTP: Fix the ioPostToHttpFromSocket auto testMartin Petersson2011-03-043-7/+18
| | * | | | | | | | | | | | | | | | | | Disable capabilities example for symbian-gcce due to a bug in elf2e32axis2011-03-031-0/+3
| | * | | | | | | | | | | | | | | | | | Fixed documentation for QByteArrayDenis Dzyubenko2011-03-031-16/+19
| | * | | | | | | | | | | | | | | | | | Improve handling QByteArray with QStringBuilderDenis Dzyubenko2011-03-033-5/+30
| | * | | | | | | | | | | | | | | | | | Do not handle posted events in QSplashScreen.Denis Dzyubenko2011-03-032-4/+10
| | * | | | | | | | | | | | | | | | | | SSL tests: Be more verbose in on-demand cert testMarkus Goetz2011-03-032-2/+2
| | * | | | | | | | | | | | | | | | | | Fix qstringbuilder test.Olivier Goffart2011-03-021-0/+1
| | * | | | | | | | | | | | | | | | | | Wrap qPrintable inside QStringOlivier Goffart2011-03-012-1/+3
| | * | | | | | | | | | | | | | | | | | Fix QTextStream::pos() causes buffer offset issues on large text files.Chris Kawano2011-03-012-0/+37
| | * | | | | | | | | | | | | | | | | | Don't compile qtconfig on symbianOlivier Goffart2011-02-281-1/+1
| | * | | | | | | | | | | | | | | | | | qtconfig: don't connect to qt3support signalsOlivier Goffart2011-02-282-7/+8
| | * | | | | | | | | | | | | | | | | | Fix errors and warnings in qtconfig.Olivier Goffart2011-02-282-2/+2
| | * | | | | | | | | | | | | | | | | | Remove qt3support dependency of qtconfigOlivier Goffart2011-02-2823-2798/+1496
| | * | | | | | | | | | | | | | | | | | SSL TLS extension on Symbian: work around missing symbolPeter Hartmann2011-02-281-0/+6
| | * | | | | | | | | | | | | | | | | | SSL: Switch default version to TLS 1.0Peter Hartmann2011-02-285-9/+9
| | * | | | | | | | | | | | | | | | | | QSslSocket backend: resolve symbols for SNI for SymbianPeter Hartmann2011-02-281-0/+3
| | * | | | | | | | | | | | | | | | | | Add QSslSocket::setPeerVerifyName()/peerVerifyName()David Faure2011-02-282-0/+31
| | * | | | | | | | | | | | | | | | | | QSslSocket SNI: prefer verificationPeerName then peerName then hostNameDavid Faure2011-02-281-2/+5
| | * | | | | | | | | | | | | | | | | | Add Server Name Identification (RFC4366 section 3.1)Daniel Black2011-02-284-0/+22
* | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-159-65/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Revert "qmake vcproj generator: do not insert $(INHERIT)"Joerg Bornemann2011-03-152-7/+6
| * | | | | | | | | | | | | | | | | | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-152-6/+7
| * | | | | | | | | | | | | | | | | | | qmake/Mac: replace @SHORT_VERSION@ in QMAKE_INFO_PLIST file not only for libsJoerg Bornemann2011-03-152-5/+15
| * | | | | | | | | | | | | | | | | | | qmake nmake / mingw32-make generators: fix DEF_FILE for shadow buildsJoerg Bornemann2011-03-152-4/+8
| * | | | | | | | | | | | | | | | | | | qmake: fix the language settings generated Windows resource filesJoerg Bornemann2011-03-151-0/+4
| * | | | | | | | | | | | | | | | | | | qmake vc(x)proj generator: fix handling of DEFINES from .prl filesJoerg Bornemann2011-03-152-14/+0
| * | | | | | | | | | | | | | | | | | | qmake vc(x)proj generator: set the output directoryJoerg Bornemann2011-03-151-37/+8
| * | | | | | | | | | | | | | | | | | | qmake vc(x)proj generator: fix reading of /YX, /Yc, /Yu compiler flagsJoerg Bornemann2011-03-151-3/+3
| * | | | | | | | | | | | | | | | | | | qmake vcproj generator: support PCHs with other extensions than .hJoerg Bornemann2011-03-152-2/+9
|/ / / / / / / / / / / / / / / / / / /