| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Explicit EXPORTUNFROZEN will prevent default defBlock generation
|
| | |
| |
| |
| |
| |
| |
| | |
If MMP_RULES contains EXPORTUNFROZEN, no DEFFILE statements should
be generated to mmp files.
Reviewed-by: Janne Koskinen
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |\ \
|/ / /
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |\ \
| | | |
| | | |
| | | | |
4.7-multimedia
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
for cross-compilation.
Reviewed-by: Rohan McGovern
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix qtlibinfix build of qml plugins (for Symbian)
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We force it to c: just as we do with all other Qt plugins
Reviewed-by: Miikka Heikkinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Checking just for count can fail when default_deployment is replaced
with single custom deployment item.
Reviewed-by: Janne Koskinen
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed qdoc3 crash.
|
| |/ / /
| | |
| | |
| | | |
Fixes "Invalid read of size 4" reported by valgrind.
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
trailing semicolon.
Reviewed-by: Rohan McGovern
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix the Qt application icon on Symbian
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Change the directory where smart-installable application package is
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
...
|
| | |\ \
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | |\ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
( 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)
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
( 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)
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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)
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix translations from some header files being omitted
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert changes to syncqt.
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit 24e198c15a807d4829d0f25d9169b8e188d57321.
This reverts commit afdda55661ddf4e054624567e6d7ef2481d3998c.
This wasn't meant for 4.6.
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix style sheet error with slider handle
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Olivier
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | |/ / / / |
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d6d6c3821ed111b214a753f1ce8fa969c1a94dc3 )
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
( d6d6c3821ed111b214a753f1ce8fa969c1a94dc3 )
Changes in WebKit/qt since the last update:
* https://bugs.webkit.org/show_bug.cgi?id=36832 -- [Qt] Destroy SharedTimerQt before destruction of QCoreApplication.
Task-number: QT-3393
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix misleading hint
support TARGETs with spaces
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
it is "FOO=bar ./configure", not "./configure FOO=bar".
Task-number: QTBUG-11058
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
this is quite a hack, but the quoting is terminally broken anyway, so
...
Task-number: QTBUG-10384
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
propagate code change back to .g source
double-quote string which contains a single-quote
|
| | | | | |
| | | | |
| | | | |
| | | | | |
missed that in 60acaf5e
|
| | | | | |
| | | | |
| | | | |
| | | | | |
qmake is just too forgiving ...
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix the bindTexture() filters on X11 to not rely on mipmap generation.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The default GL_TEXTURE_MIN_FILTER is GL_NEAREST_MIPMAP_LINEAR, which
means you have to have mipmaps generated in order for it to produce
correct results. We don't use mipmaps when this particular path
is taken, so use texture filters that is in line with what we do in the
non-pixmap_to_texture path.
Task-number: QTBUG-11158
Reviewed-by: Kim
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QWS build failure
Removed compiler warnings
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
|
