summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* link glu32 before opengl32Oswald Buddenhagen2010-07-017-7/+7
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-0114-686/+736
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-308-678/+701
| |\
| | * Reformat whitespace according to coding styleMark Brand2010-06-306-676/+676
| | * QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets.Jocelyn Turcotte2010-06-301-0/+19
| | * QGraphicsProxyWidget: Fixes QComboBox popup closing issue.Jocelyn Turcotte2010-06-302-2/+6
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-303-2/+15
| |\ \
| | * | Fix invalid bookmark in anomaly demoMiikka Heikkinen2010-06-302-2/+1
| | * | Fixed pre-built resources deployment in SymbianMiikka Heikkinen2010-06-301-0/+14
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-303-6/+20
| |\ \ \ | | |/ / | |/| / | | |/
| | * Crash while changing the windows flags from a Qt::Drawer window on CocoaPrasanth Ullattil2010-06-301-3/+5
| | * Fix regression in popup behavior on WindowsJens Bache-Wiig2010-06-091-1/+1
| | * SSL backend: correct ordering of root CA certificates in the storePeter Hartmann2010-06-301-2/+14
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-301-2/+3
| |\ \ | | |/
* | | Stopped trying to output QML property list in 2 columnsMartin Smith2010-06-301-0/+1
| |/ |/|
* | Merge commit 'staging/4.7' into qt-3541Aaron McCarthy2010-06-3078-149/+195
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-2973-147/+168
| |\
| | * Fixed deployment paths for WebKit declarative plugin.axis2010-06-291-1/+1
| | * Fix s60main linking issue with gcce applicationsMiikka Heikkinen2010-06-291-0/+4
| | * Merge branch 'buildSystemFixes' into 4.7-s60axis2010-06-2971-142/+163
| | |\
| | | * Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-293-6/+7
| | | * Fixed a relative path problem in qml demos.axis2010-06-297-7/+7
| | | * Added the APP_PRIVATE_DIR_BASE variable.axis2010-06-291-1/+2
| | | * Various fixes to autotests when using the symbian/linux-armcc mkspec.axis2010-06-2958-65/+81
| | | * Fixed Symbian resources not honoring TARGET with a path.axis2010-06-292-63/+66
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-291-4/+0
| | |\ \
| | | * | Removed useless comments.axis2010-06-291-4/+0
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-285-2/+27
| | | | |\ \
| | | | | * | Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7Simon Hausmann2010-06-285-2/+27
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-297-13/+60
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-291-22/+33
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Fix build failure on Symbian^3.Aaron McCarthy2010-06-301-2/+3
| |_|/ / / / |/| | | | |
* | | | | | warn about stray meta dataOswald Buddenhagen2010-06-292-4/+8
* | | | | | don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-294-0/+30
* | | | | | fix double percent sign after migration to yyMsg()Oswald Buddenhagen2010-06-291-2/+2
* | | | | | Improved QCommandLinkButton's vertical spacingJohn Brooks2010-06-291-5/+13
* | | | | | syncqt: abort on permission error writing to include/QtArvid Picciani2010-06-291-3/+3
* | | | | | added a comment for QByteArray::replace(..)Zeno Albisser2010-06-291-0/+5
| |/ / / / |/| | | |
* | | | | When application calls QNetworkSession::close() or QNetworkSession::stop(), m...Jukka Rissanen2010-06-291-22/+33
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-2825-141/+365
|\ \ \ \
| * | | | Enable SSE2 for MSVC x64 builds, as it was incorrectly disabledJohn Brooks2010-06-282-5/+4
| * | | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-06-285-5/+56
| * | | | ignore *.vcxproj.userOswald Buddenhagen2010-06-281-0/+1
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-2818-126/+258
| |\ \ \ \
| | * | | | Don't load ciphers and system certificates for QSslSocket::supportsSsl()Andreas Kling2010-06-283-12/+50
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-28100-1114/+2810
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-25921-23048/+12696
| | |\ \ \ \ \