| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/gui/kernel/qapplication.cpp
src/gui/text/qtextlayout.cpp
src/openvg/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
tools/runonphone/main.cpp
tools/runonphone/serenum_unix.cpp
qtextlayout.cpp fixed up together with Eskil.
Kept the configure.exe from 4.7 without recompile.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Configure parameter -qtlibinfix will now change also plugin names
of plugins built and installed with Qt in Symbian.
Default plugin path is changed to: /resource/qt<libinfix>/plugins.
Other plugins besides the ones installed with Qt are not renamed.
With infixed configuration, Qt can be installed on a phone that already
has a Qt installed on ROM without interfering with the ROM version of
Qt.
Note that since s60main.rsc resource cannot deployed with infixed Qt,
and infixing it is somewhat problematic, currently the phone needs
to have proper Qt installation, too, for infixed Qt to work.
It also means that any changes to Qt that would affect s60main.rsc
cannot be tested on real device using infixed builds. Since this file
is unlikely to need changing, this should not be a big problem.
Task-number: QTBUG-9065
Reviewed-by: Jani Hautakangas
|
|\ \
| |/
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake_abld.cpp
|
| |
| |
| |
| |
| |
| | |
Part of QtP delta reduction effort, original task: QTTH-52
Reviewed-by: Janne Anttila
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/embedded/anomaly/anomaly.pro
demos/embedded/flightinfo/flightinfo.pro
demos/embedded/lightmaps/lightmaps.pro
demos/embedded/weatherinfo/weatherinfo.pro
examples/network/fortuneclient/fortuneclient.pro
examples/network/fortuneserver/fortuneserver.pro
examples/network/network-chat/network-chat.pro
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/platform_paths.prf
qmake/generators/symbian/symmake.cpp
qmake/generators/symbian/symmake.h
src/s60installs/s60installs.pro
|
| |
| |
| |
| |
| |
| |
| | |
A recent sym_iap_util.h change make it depend on different libraries.
Fixed LIBS statements on relevant examples and demos.
Reviewed-by: Janne Anttila
|
| |
| |
| |
| |
| |
| |
| | |
A recent sym_iap_util.h change make it depend on different libraries.
Fixed LIBS statements on relevant examples and demos.
Reviewed-by: Janne Anttila
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.cpp
qmake/generators/symbian/symmake_sbsv2.cpp
src/plugins/plugins.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The logic used in this commit is partially taken from sliders.
This commit makes it possible to interact (change row or column)
in itemview even itemview does not have editFocus. Interacting without
editFocus is enabled when it is not possible to keypad navigate to
reuqested direction. In addition if keypad navigation to any direction is
not possible (i.e there is only one listwidget on screen), there is no
sense to add "done" softkey to get out of edit focus.
Task-number: QTBUG-4802
Reviewed-by: Alessandro Portale
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The sis target will depend on the main build target of each project,
which should make it possible to simply run "make sis" in the root of
a clean tree (after configure, of course), and have sis packages
generated for everything. It works at least for Qt.
This required some changes to the dependency generation in Qt, to
make sure that s60installs builds its package after all of Qt, and
that fluidlauncher has all the required files before building a
package.
In addition, all the sis target code was moved into its own qmake
feature file, called sis_targets. It is currently enabled by default
for Symbian.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.cpp
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
Conflict resolution was heavily based on manual application of commit
9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Smart installer packages bundle normal application sis with a bootstrap
package that will download a smart installer when the package
is installed. Smart installer in turn will download any dependencies
of the application that are available on remote server, such as
Open C, Qt, and QtWebkit packages, and install them
Smart installer packages are generated when DEPLOYMENT.installer_header
variable is defined in applicatoin .pro file.
This commit is still missing properly signed bootstrap.sis package.
Task-number: QTBUG-7908
Reviewed-by: Shane Kearns
|
|/ |
|
|
|
|
|
| |
Task-number: QTBUG-7518
Reviewed-by: Janne Koskinen
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Having the prefered content size equals to the screen size gives
some bad layout on devices.
|
|
|
|
|
|
| |
At load time, loading, layouting and painting are fighting for
the CPU. By skipping painting and layouting, we achieve a better
loading time, and the experience is better.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
Change the behavior of the scrolling so it is more usable on
small devices. Add a code path for accelerating the autoscrolling
if paning over a auto-scrolling frame.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In preparation for future removal of Webkit from Qt, Qt.sis no longer
contains QtWebkit.dll. All projects that have webkit dependency now
automatically also add dependency qtwebkit.sis into their .pkg files.
To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore
directory.
Task-number: QTBUG-6841
Reviewed-by: Simon Hausmann
Reviewed-by: Janne Koskinen
|
|
|
|
|
| |
The sliding surface does not move, the position of the children
must be used to find the correct layout.
|
|
|
|
|
|
|
|
| |
Some minor changes to improve the demo:
-use QUrl::fromUserInput()
-scroll a surface instead of moving the widgets
to minimize the repaint
-use the animation framework instead of QTimeLine
|
|
|
|
|
| |
Task-number: QTBUG-6367
Reviewed-by: Janne Anttila
|
|
|
|
|
|
|
|
|
| |
This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0.
It can be reverted now since mifconv invoking is changed to use
relative paths instead of absolute one.
Task-number: QTBUG-4745
Reviewed-by: TrustMe
|
|
|
|
| |
Over src/ tools/ examples/ and demos/
|
|
|
|
|
|
|
| |
It has too many problems at the moment, like taking up too much space
and not being able to close the popup window.
RevBy: Alessandro Portale
|
|
|
|
|
|
|
| |
Stripping 350k off by reencoding the mp3.
32 Kbps, mono, 22.05 KHz.
Reviewed-by: trustme
|
|
|
|
|
|
| |
Using pngout to make the fluidlauncher a bit lighter.
Reviewed-by: trustme
|
|
|
|
|
|
| |
Using pngout to make the fluidlauncher a bit lighter.
Reviewed-by: trustme
|
|
|
|
|
|
| |
Using pngout to make the fluidlauncher a bit lighter.
Reviewed-by: trustme
|
|
|
|
|
|
|
| |
Using pngout to make the fluidlauncher a bit lighter.
And to reduce Anomalies memory footprint.
Reviewed-by: trustme
|
|
|
|
|
|
| |
Using pngout to make the fluidlauncher a bit lighter.
Reviewed-by: trustme
|
|
|
|
|
|
|
| |
SVG graphics may contain much unneeded stuff. I used Inkscape's
vacuum function and Ariya's svgmin. Much better now.
Reviewed-By: trustme
|
|
|
|
| |
Reviewed-by: aportale
|
|
|
|
|
| |
Task-number: QT-2162
Reviewed-by: axis
|
| |
|
|
|
|
|
|
|
|
| |
Amend commit faef2f5101287ad8ce94cf8e7a4d574a7d6267fd, with this build
fix.
Task-number: QTBUG-4743
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Symbian already has the executables musicplayer.exe, mediaplayer.exe and
ftp.exe, with the result that we overwrite them with Qt. We solve this
by renaming the examples, and do it not only on Symbian, such that Qt
remains consistent across platforms.
This was previously partly done for mediaplayer. The folder name needs
to be consistent with the executable, for qtdemo to work. Done jointly
with Alessandro.
Task-number: QTBUG-4743
Reviewed-by: Alessandro Portale
Reviewed-by: Frans Englich
|
|
|
|
|
|
|
|
|
|
|
| |
Let's make sure to have enough layout spacings around
the widgets in order to see the focusrect.
Also, the issue with the growing dialog is fixed. It
was the spinbox and it's label which with the stylesheets
set did not have enough horizontal space, and thus
made the dialog grow on the following CSS change
Reviewed-By: TrustMe
|
|
|
|
|
|
|
|
| |
mifconv can't always handle absolute paths to the .svg specified, so for
now we don't use absolute paths, and fix it later.
Task-number: QTBUG-4693
Reviewed-by: Shane Kearns
|
|\
| |
| |
| |
| | |
Conflicts:
demos/mediaplayer/mediaplayer.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added a line to the symbianpkgrules.pri files which includes an ICON
if the TARGET.UID3 is defined. We should fix the application_icon.prf to
handle ICON without UID3 situations more gracefully, but for now I
reordered existing UID3s to be specified before the symbianpkgrules.pri
includes.
Reviewed-by: Aleksandar Babic
|
| | |
|
| |
| |
| |
| |
| | |
Note that fluidlauncher, because of desktopservices, installs the same mp3
to the same location.
|
|/
|
|
|
| |
Task-number: QTBUG-4665
Reviewed-by: Gareth Stockwell
|
|
|
|
|
|
|
|
| |
To improve screen real-estate utilization in small screen devices,
added -small-screen command line argument to the Context2d application.
Task-number: QTBUG-3296
Reviewed-by: Janne Koskinen
|
|\ |
|
| |
| |
| |
| |
| |
| | |
It seems that for 3.1 we need to explicitly link with insock.dll as well
Reviewed-by: Aleksandar Babic
|
|/ |
|