summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Avkon removal configured with -no-s60mread2010-07-0127-121/+338
| | | | | | | | | | | | | | | | Avkon dependencies can be configured out with the -no-s60 configure flag, conversely Qt on Symbian will use Avkon if -s60 is configured. These changes are intended to keep or introduce binary compatibility between the s60 and no-s60 configurations. To do this, it has been necessary to introduce stub equivalents of the CAknAppUi related classes into the no-s60 configuration, and override all Avkon framework virtual functions in the QS60Main... classes. Other than that, these changes are mostly just correcting the use of the Q_WS_S60 flag so that it only refers to Avkon dependencies. Reviewed-by: Sami Merila
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-07-0115-688/+739
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-308-678/+701
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Reformat whitespace according to coding style QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets. QGraphicsProxyWidget: Fixes QComboBox popup closing issue.
| | * Reformat whitespace according to coding styleMark Brand2010-06-306-676/+676
| | | | | | | | | | | | | | | | | | | | | | | | Mostly indentation affected, but also standardized spaces adjacent to () in configureapp.cpp. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets.Jocelyn Turcotte2010-06-301-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue in QtWebKit where scrolling with the wheel while a combo box is opened cause the page to scroll while the popup don't move. This patch either ignore the event on Mac or close the popup on other platforms. Reviewed-by: Yoann Lopes
| | * QGraphicsProxyWidget: Fixes QComboBox popup closing issue.Jocelyn Turcotte2010-06-302-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This happens when the QComboBox popup gets closed by QGraphicsScenePrivate::removePopup and then the QComboBox gets hidden. If the QComboBox gets shown again, the popup will be shown as well since it was not explicitly hidden. Reviewed-by: Yoann Lopes
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-303-2/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix invalid bookmark in anomaly demo Fixed pre-built resources deployment in Symbian
| | * | Fix invalid bookmark in anomaly demoMiikka Heikkinen2010-06-302-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | BBC news bookmark was no longer valid. Task-number: QTBUG-11795 Reviewed-by: Janne Koskinen
| | * | Fixed pre-built resources deployment in SymbianMiikka Heikkinen2010-06-301-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre-built resources didn't get properly copied under \epoc32\data\z. Task-number: QTBUG-11519 Reviewed-by: Janne Koskinen
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-303-6/+20
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Crash while changing the windows flags from a Qt::Drawer window on Cocoa Fix regression in popup behavior on Windows SSL backend: correct ordering of root CA certificates in the store
| | * Crash while changing the windows flags from a Qt::Drawer window on CocoaPrasanth Ullattil2010-06-301-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | The crash was caused while checking the visibility of the toolbar inside a native cocoa window. There is no toolbar for a drawer window. Task-number: QTBUG-11138 Reviewed-by: Denis
| | * Fix regression in popup behavior on WindowsJens Bache-Wiig2010-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Popups without a parent would unintentionally deactivate their parents following af7d2b2127d. In order to avoid this, we do not activate popups when there is an active application window. System tray popups are still activated. Reviewed-by: denis Task-number: QTBUG-11061
| | * SSL backend: correct ordering of root CA certificates in the storePeter Hartmann2010-06-301-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some CAs have several root certificates with the same SubjectInfo, but different expiration date. This means that OpenSSL needs to choose the valid root certificate over the expired ones when verifying a certificate chain. Apparently, the certs added to the store first are the ones that get used first, so we add the expired ones at the end. Reviewed-by: Thiago Macieira Task-number: QTBUG-11664
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-301-2/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix build failure on Symbian^3.
| | * Merge commit 'staging/4.7' into qt-3541Aaron McCarthy2010-06-3078-149/+195
| | |\ | | |/ | |/|
| | * Fix build failure on Symbian^3.Aaron McCarthy2010-06-301-2/+3
| | |
* | | QFileDialog broken in landscape in N8Sami Merila2010-06-301-6/+9
|/ / | | | | | | | | | | | | | | | | The screen estate runs out for nHD landscape. Due to this, all "system" dialogs (file, color, font dialogs and wizards) in Symbian are now shown in fullscreen mode, instead of being just maximized. Task-number: QTBUG-11668 Reviewed-by: Miikka Heikkinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-2973-147/+168
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed deployment paths for WebKit declarative plugin. Fix s60main linking issue with gcce applications Fixed deployment paths for the symbian/linux-armcc mkspec. Fixed a relative path problem in qml demos. Added the APP_PRIVATE_DIR_BASE variable. Various fixes to autotests when using the symbian/linux-armcc mkspec. Fixed Symbian resources not honoring TARGET with a path. Removed useless comments.
| * | Fixed deployment paths for WebKit declarative plugin.axis2010-06-291-1/+1
| | |
| * | Fix s60main linking issue with gcce applicationsMiikka Heikkinen2010-06-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA must not be included in s60main build, otherwise some symbols will not be relocatable when linked against from gcce build. Task-number: QTBUG-11804 Reviewed-by: Alessandro Portale
| * | Merge branch 'buildSystemFixes' into 4.7-s60axis2010-06-2971-142/+163
| |\ \ | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf
| | * | Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-293-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Paths to executables matter on that build system, unlike on Raptor. RevBy: Trust me
| | * | Fixed a relative path problem in qml demos.axis2010-06-297-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | qmake doesn't handle the relative path very well. RevBy: Alessandro Portale
| | * | Added the APP_PRIVATE_DIR_BASE variable.axis2010-06-291-1/+2
| | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | * | 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
| | | | | | | | | | | | | | | | | | | | Task: QT-3540 RevBy: Thomas Zander
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-291-4/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed useless comments.
| | * | | Removed useless comments.axis2010-06-291-4/+0
| | | | | | | | | | | | | | | | | | | | Not relevant anymore after 5b5ae51b22b.
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-285-2/+27
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7
| | | | * | | Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7Simon Hausmann2010-06-285-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | || <https://webkit.org/b/40000> || [Qt] QGraphicsWebView crash when calling setScale() before setUrl() || || <https://webkit.org/b/38597> || [Qt] QtTestBrowser does not have a "Load" button ; therefore, unable to load pages on touch only symbian devices (portrait mode). ||
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-297-13/+60
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: warn about stray meta data don't complain multiple times about same abuse of //% meta strings fix double percent sign after migration to yyMsg() Improved QCommandLinkButton's vertical spacing syncqt: abort on permission error writing to include/Qt added a comment for QByteArray::replace(..)
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen Task-number: QTBUG-11818
| * | | | | fix double percent sign after migration to yyMsg()Oswald Buddenhagen2010-06-291-2/+2
| | | | | |
| * | | | | Improved QCommandLinkButton's vertical spacingJohn Brooks2010-06-291-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no description is present, the text is centered alongside the icon. The top and bottom margins are now an equal 10px. Merge-request: 2424 Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
| * | | | | syncqt: abort on permission error writing to include/QtArvid Picciani2010-06-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 707 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | | | added a comment for QByteArray::replace(..)Zeno Albisser2010-06-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thomas Zander Task-number: QTBUG-8370
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-291-22/+33
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: When application calls QNetworkSession::close() or QNetworkSession::stop(), make sure the disconnected signal is sent even if the actual network connection is not closed.
| * | | | When application calls QNetworkSession::close() or QNetworkSession::stop(), ↵Jukka Rissanen2010-06-291-22/+33
|/ / / / | | | | | | | | | | | | | | | | | | | | make sure the disconnected signal is sent even if the actual network connection is not closed. Fixes: NB#175064 - QNetworkSession signals wrong state after calling stop()
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-2825-141/+365
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Enable SSE2 for MSVC x64 builds, as it was incorrectly disabled Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-28062010 ( 0fccd26d3624e80cf68873701ef70ad72ca66bec ) ignore *.vcxproj.user doc: Added more DITA output to the XML generator Don't load ciphers and system certificates for QSslSocket::supportsSsl() Doc: Fixed whitespace issues and added missing files to lists. Doc: Fixed links in the QML documentation. Doc: Changed links to explicitly refer to QML objects. qdoc: Added a workaround for QML/Qt class name clashes.
| * | | | Enable SSE2 for MSVC x64 builds, as it was incorrectly disabledJohn Brooks2010-06-282-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 718 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-06-285-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-28062010 ( 0fccd26d3624e80cf68873701ef70ad72ca66bec ) Changes in this update: - Fix Mac OS SnowLeopard-vs-Leopard deployment issue - Fix compilation with Intel compiler
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading these uses about 1 MB of memory and can be be deferred until it's actually needed. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | * | | | 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
| | |\ \ \ \ \
generated by cgit v0.12 at 2025-01-10 06:49:55 (GMT)