summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-06-111-1/+1
|\
| * Show EditorDateEdit before changing selection in qdatetimeedit testMiikka Heikkinen2010-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | In Symbian plaform showing a widget automatically focuses it by design, which breaks this test case. Changed the selection change to happen after widget show, as this test case doesn't require it to happen before show. Task-number: QTBUG-11046 Reviewed-by: axis
* | Stylus menu for Share (QT app) is different from native S60 appsSami Merila2010-06-112-19/+67
|/ | | | | | | | | | | | | First part of corrections to make menu items more native like. This fixes: - In Sym^3 "separator items" are drawn automatically between items, using a simple line graphic with theme color and alpha values - highlight for menu item is positioned better - menu items themselves are better positioned - the corners of highlight are now more rounded for Sym^3 devices Task-number: QT-3295 Reviewed-by: Alessandro Portale
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-06-1113-53/+109
|\
| * Merge branch 'runonphone_targets' into 4.7-s60axis2010-06-117-26/+28
| |\
| | * Moved runonphone target to prf files for all build systems.axis2010-06-117-27/+24
| | | | | | | | | | | | | | | | | | This reduces code duplication. RevBy: Miikka Heikkinen
| | * Fixed destdir not being defined.axis2010-06-101-0/+4
| | | | | | | | | | | | | | | | | | Local variables can't be counted upon between different profiles. RevBy: Trust me
| | * Enable runonphone target for libraries as well.axis2010-06-101-2/+3
| | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | Fix recursive targets for src.proMiikka Heikkinen2010-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dependencies to tools moc, rcc and uic on some subdirs break recursive targets like 'make sis' for symbian-abld and symbian-sbsv2 builds. There is no need to have any subdir dependencies for above mkspecs as those builds are always ordered anyway. Task-number: QTBUG-5312 Reviewed-by: Janne Koskinen
| * | Fix recursive 'make sis' for symbian buildsMiikka Heikkinen2010-06-111-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes no sense for 'sis' to depend on 'first' or really any target in symbian-abld and symbian-sbsv2 builds, as all builds are recursive anyway. Also do not generate real sis targets for projects that do not actually deploy anything, making the check equivalent to one in qmake for generating pkg files. Task-number: QTBUG-5312 Reviewed-by: Janne Koskinen
| * | Update 4.7 def filesShane Kearns2010-06-104-24/+67
| |/ | | | | | | Reviewed-by: Trust Me
* | Incorrectly named keys in QS60StyleEnums::SkinPartsSami Merila2010-06-113-60/+60
|/ | | | | | | | | | | Some of the internal part names of QS60Style do not match the real theme item names, making automated tool use to make "theme blob" for QCreator simulator manual work. Renamed the parts to match native side names. Task-number: QTBUG-11053 Reviewed-by: Alessandro Portale
* QS60Style: QComboBox displays checkboxes for itemsSami Merila2010-06-101-1/+8
| | | | | | | | | | | | QComboMenuDelegate claims that all combobox menu items should be checkable even if they aren't. In all the other styles, it has been circumvented in the style code that this particular setting from QComboMenuDelegate is ignored. :) Adding the same workaround to QS60Style as well. Task-number: QTBUG-11322 Reviewed-by: Alessandro Portale
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-102-2/+3
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Explicit EXPORTUNFROZEN will prevent default defBlock generation
| * Explicit EXPORTUNFROZEN will prevent default defBlock generationMiikka Heikkinen2010-06-102-2/+3
| | | | | | | | | | | | | | If MMP_RULES contains EXPORTUNFROZEN, no DEFFILE statements should be generated to mmp files. Reviewed-by: Janne Koskinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-101-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Problems with missing symbols on QWS/AIX. Include freetype synthesis file for cross-compilation.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-101-0/+1
| |\ \ |/ / / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Problems with missing symbols on QWS/AIX. Include freetype synthesis file for cross-compilation.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Toby Tomkins2010-06-1048-116/+769
| |\ \ | | | | | | | | | | | | 4.7-multimedia
| * | | Problems with missing symbols on QWS/AIX. Include freetype synthesis file ↵Toby Tomkins2010-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | for cross-compilation. Reviewed-by: Rohan McGovern
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-091-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix qtlibinfix build of qml plugins (for Symbian)
| * | | Fix qtlibinfix build of qml plugins (for Symbian)Alessandro Portale2010-06-091-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Qml plugins are need also to be renamed for a qtlibinfix. plugins/qpluginbase.pri does taht renaming, thus it needs to be included by qml projects just as it needs to be included by any other Qt plugin project. I am just including plugins/qpluginbase.pri for Symbian for now. If needed, include it also for other platforms.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-092-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix Symbian install path for Qml plugins Fixed DEPLOYMENT variable check in sis_targets.prf
| * | | Fix Symbian install path for Qml pluginsAlessandro Portale2010-06-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | We force it to c: just as we do with all other Qt plugins Reviewed-by: Miikka Heikkinen
| * | | Fixed DEPLOYMENT variable check in sis_targets.prfMiikka Heikkinen2010-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking just for count can fail when default_deployment is replaced with single custom deployment item. Reviewed-by: Janne Koskinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-091-3/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed qdoc3 crash.
| * | | Fixed qdoc3 crash.Rohan McGovern2010-06-091-3/+3
|/ / / | | | | | | | | | Fixes "Invalid read of size 4" reported by valgrind.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-091-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compilation for solaris based compilers, macro doesn't require trailing semicolon.
| * | Fixed compilation for solaris based compilers, macro doesn't require ↵Toby Tomkins2010-06-091-1/+1
| | | | | | | | | | | | | | | | | | trailing semicolon. Reviewed-by: Rohan McGovern
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-081-15/+91
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix the Qt application icon on Symbian
| * | Fix the Qt application icon on SymbianAlessandro Portale2010-06-081-15/+91
|/ / | | | | | | | | | | | | | | | | It simply did not have the required (and square) dimensions as Symbian icons need to have. Therefore it looked odd, in different ways on different Symbian flavours. On Symbian^3, it was even distorted. Task-number: QTBUG-4786 Reviewed-by: trustme
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change the directory where smart-installable application package is
| * | Change the directory where smart-installable application package isMiikka Heikkinen2010-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | For security reasons, it is better to install application packages into the private directory of the smart installer rather than a public directory. Task-number: QTBUG-11288 Reviewed-by: Aleksandar Sasha Babic
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-06-0845-97/+674
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (44 commits) fix translations from some header files being omitted Revert changes to syncqt. Fix style sheet error with slider handle deprecate header files in $$QT_BUILD_TREE/include/Qt syncqt: tabs changes to spaces Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d6d6c3821ed111b214a753f1ce8fa969c1a94dc3 ) fix misleading hint support TARGETs with spaces propagate code change back to .g source double-quote string which contains a single-quote Fix the bindTexture() filters on X11 to not rely on mipmap generation. Fix QWS build failure Removed compiler warnings qmake: don't warn about unknown MSVC compiler option /MP Window visibility changes update TLW backing store reference count Enable visibility change events on all Symbian native windows Added reference counting to QWidgetBackingStore Added tst_QWidget::destroyBackingStoreWhenHidden Windows CE: missing null check added in qapplication_win.cpp Clipping with rounded rectangles and QVG_SCISSOR_CLIP ...
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-0845-97/+674
| |\ \ |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/painting/qpainter.cpp src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qfontmetrics/tst_qfontmetrics.cpp tools/linguist/lupdate/main.cpp
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-080-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb ) Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab ) Always construct s60 screen furniture even if not used. Change to release licenses for 4.6.3.
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-080-0/+0
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb ) Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab ) Always construct s60 screen furniture even if not used. Change to release licenses for 4.6.3.
| | * | Merge commit 'v4.6.3' into 4.6Jason McDonald2010-06-080-0/+0
| | |\ \
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵v4.6.3Simon Hausmann2010-06-013-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-05-19 Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed by Kenneth Rohde Christiansen. When creating the UA, do not sassmue the language code is a two-letter iso639-1 code. * Api/qwebpage.cpp: (QWebPage::userAgentForUrl): (cherry picked from commit 704dfe0bf4a85cb203a6bb84ab2a3db0b92d3d6b)
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-06-012-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab ) Changes in WebKit/qt since the last update: * [Qt] Update the Symbian version for the user agent -- https://bugs.webkit.org/show_bug.cgi?id=38389 (cherry picked from commit 4bdd6722218ce2afb11b3b12e261f81d41aef82f)
| | | * | Always construct s60 screen furniture even if not used.Janne Koskinen2010-06-011-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not creating screen furniture in full screen caused regression when swapping into idle screen and back on Nokia 5800. Task-number: QTBUG-10985 Reviewed-by: Jason Barron (cherry picked from commit 4a4e5e7d54c559d54e9079dacb9c2fd32770f018)
| | | * | Change to release licenses for 4.6.3.Jason McDonald2010-05-308885-115693/+115693
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-075-0/+108
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix translations from some header files being omitted
| | * | | | fix translations from some header files being omittedOswald Buddenhagen2010-06-075-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the containing directories of all files specified on the command line to the list of project roots. otherwise, the strings from headers which are included before being encountered on the command line will be omitted. Task-number: QTBUG-10345
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-071-392/+370
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert changes to syncqt.
| | * | | | Revert changes to syncqt.Joerg Bornemann2010-06-071-392/+370
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 24e198c15a807d4829d0f25d9169b8e188d57321. This reverts commit afdda55661ddf4e054624567e6d7ef2481d3998c. This wasn't meant for 4.6.
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-071-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix style sheet error with slider handle
| | * | | | Fix style sheet error with slider handleqCaro2010-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-041-370/+392
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: deprecate header files in $$QT_BUILD_TREE/include/Qt syncqt: tabs changes to spaces
| | * | | | | deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-041-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To resolve the header file conflict as described in QTBUG-10647, we * remove include/Qt/private * "syncqt -copy" creates in include/Qt local forwarding headers instead of header file copies In case of a conflict, e.g. qxmlstream.h, we include both header files. All header files in include/Qt now yield a preprocessor warning, if they're included. They should not be used and will vanish some day. Task-number: QTBUG-10647 Reviewed-by: ossi
| | * | | | | syncqt: tabs changes to spacesJoerg Bornemann2010-06-041-369/+369
| | |/ / / /
generated by cgit v0.12 at 2025-08-16 23:49:23 (GMT)