| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
|
|
|
|
| |
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
| |
The function addExclusiveBuilds doesn't work on Symbian and is unlikely
to ever work due to build system mandated target directories, so ignore
static_and_shared in Symbian builds that rely on Symbian toolchains.
Task-number: QTBUG-16298
Reviewed-by: axis
|
|
|
|
|
|
|
| |
To support linux builds, file names must be cased correctly.
Task-number: QT-4375
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
| |
ICC 12 keeps outputting this when you copy a type of larger size to
a smaller, or from int to float.
|
|
|
|
|
| |
Task-number: QTBUG-14736
Reviewed-by: Alessandro Portale
|
|
|
|
|
|
|
|
|
|
|
| |
Removed the unnecessary checks for the case where pkg file doesn't exist
are no longer needed as we now have dependencies to pkg files and no
sis creation targets are generated if pkg is not generated.
Also improved documentation a bit and added the missing
ok_installer_sis target generation.
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
Added missing Symbian language codes for which an Qt equivalent was
available. Some codes were mapped to language/country pairs.
Task-number: QTBUG-15293
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
| |
Any application linking to QtNetwork, QtWebKit, or QtDeclarative is
likely to utilize network, so add NetworkServices capabiltity for
these applications by default in Symbian. Also increased the default
epocheap maximum size for these applications.
Task-number: QTBUG-14472
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
| |
Use $$[QT_INSTALL_DATA] instead of $$[QT_INSTALL_PREFIX] when adding
include path that points under mkspecs.
Task-number: QTBUG-15501
Reviewed-by: axis
|
|\
| |
| |
| |
| |
| | |
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Petri Latvala
|
| |
| |
| |
| |
| |
| | |
add -Wno-psabi
Reviewed-by: Adrian Constantin
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If developer specifies "CONFIG += localize_deployment" in .pro file,
the generated .loc and .pkg will now use translatable strings from
.ts files defined in TRANSLATIONS. The .ts files must have an
underscore and Qt language code at the end of the filename body
to be compatible with deployment localization. E.g. myapp_en.ts.
Running lupdate will generate these entries into .ts files:
- Application short caption
- Application long caption
- Package name
- Smart installer package name
Task-number: QTBUG-13917
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Janne Anttila
Reviewed-by: axis
|
|
|
|
| |
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
| |
This commit also fixes the issue that 564058a1bb didn't, namely that
config tests broke on Symbian. It does this by continuing to use the
Open C libcrt0.lib library for non-Qt applications. This is also more
correct, since you should not have to compile the Qt libs to compile
a non-Qt app.
Task: QTBUG-14735
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Default application deployment was hard coded in qmake, so it was
impossible to replace with custom deployment. Now the default deployment
is generated via .prf files and is removable.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 494ce0dac35c7ade0ce78589878597a7ca912864
Task-number: QTBUG-15068
Task-number: QTBUG-13367
Reviewed-by: axis
Conflicts:
qmake/generators/symbian/symbiancommon.cpp
|
|
|
|
|
|
|
| |
This reverts commit 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334.
It breaks massively on the symbian/linux-armcc mkspec. Will find a
different solution.
|
|
|
|
|
|
|
|
|
| |
Using Open C's libcrt0.lib to provide entry point caused problems
for applications that launched other processes, as Open C retains a
handle to all launched processes even after said processes terminate.
Task-number: QTBUG-14735
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
| |
that linker optimization is on by default in release builds, so override
/DEBUG implicitly turning it off. as it happens, this implicitly
disables incremental linking, so that option can go away now.
Reviewed-by: joerg
Task-number: QTBUG-14007
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Prepend epocroot to extra target tools if they start with /epoc32/
QS60Style: ComboBox disappears after orientation switch
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This makes it possible to define extra targets and extra compilers
commands that use tools under EPOCROOT without having to worry
whether EPOCROOT contains drive letter or not, which is demanded
by sbsv2 toolchain.
For example, if command to be used is
"%EPOCROOT%epoc32/tools/foobar.exe", the EPOCROOT should be omitted
in .pro file and the command be given simply as
"/epoc32/tools/foobar.exe".
Reviewed-by: Janne Koskinen
|
|/
|
|
|
|
|
|
|
|
|
| |
cp on unix doesn't create the destination directory if it doesn't exist,
as xcopy on windows does.
This also requires QMAKE_MKDIR to use mkdir -p to be able to create
directories recursively.
Merge-request: 861
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits)
Revert "qmake: pass include directories to MS resource compiler"
Fix User 46 Panic in bearer management on Symbian.
Assistant: Insert all keywords with empty ids, as ids are not mendatory.
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
...
|
| |
| |
| |
| |
| |
| |
| |
| | |
Respect the pkg-config tool specified in qmake.conf. This is
useful when crossbuilding.
Merge-request: 850
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/
|
|
|
|
|
| |
This will fix the issue with deploying files when destination is
owned by another user.
Reviewed-by: TrustMe
|
|
|
|
| |
RevBy: Liang Qi
|
|
|
|
|
|
|
| |
Also removed the use of DIR_SEPARATOR. It does not get defined until
after symbian.conf has finished parsing.
RevBy: Miikka Heikkinen
|
|
|
|
| |
Task-number: QT-3930
|
|
|
|
|
| |
Done-with: Liang Qi
Reviewed-by: Trust me
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added support for unsigned smart installer package creation in Symbian
Fix QApplication::desktop()->availableGeometry() for Symbian
QS60Style: Possible NULL pointer use when drawing frame
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Make target "unsigned_installer_sis" can now be used to create
unsigned smart installer sis. The contained application sis
will also be unsigned.
Task-number: QTBUG-13902
Reviewed-by: axis
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
Add declarative changelog entries for 4.7.1
connman backend
My changelog entries for 4.7.1
updated changes-4.7.1
Update frameGeometry when the unified toolbar visiblity is toggled
Update changelog
my contributions to dist/changes-4.7.1
My 4.7.1 changes.
added my and Jan-Arve's change to changelog for 4.7.1
Changes done for 4.7.1
Updated changes-4.7.1
My changes.
Fix for bug QTMOBILITY-448 to list the default network configuration in Bearermonitor example
Initialise pointer variables.
An aborted QNetworkSession on Maemo must emit SessionAbortedError.
Autotest: also enable testing of QtDeclarative
Add Qt 4.7.0 baseline symbols to the 4.7 branch
Call createpackage without the explicit .bat suffix
Improve Qt/Symbian compatibility with unix shells
Ukrainian translation updated
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On windows, the .bat file is implicitly called, on unix the "createpackage"
shell script wrapper is called instead.
The symbian-sbsv2 mkspec already calls createpackage without any suffix.
Merge-request: 823
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Remove an "echo." call that doesn't work on unix, and make the
create_temps target work with unix shell syntax (QMAKE_CHK_DIR_EXISTS
requires an || before the command to execute on unix shells).
Merge-request: 823
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
for some bizarre reason, mingw doesn't like double quotes.
so instead of building some more elaborate custom quoting, just let
qmake do it for us.
Reviewed-by: mariusSO
|
|/
|
|
|
|
|
|
|
|
|
|
| |
Previously manual editing of the pkg file was required to publish
application using smart installer. Now a proper app_installer.pkg
will be created as long as application has protected range UID.
Also changed "make installer_sis" to always generate the application
sis as publishing process supports signing both application and its
smart installer wrapper packages in single step.
Task-number: QTBUG-13991
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
| |
Now returns correct value for Symbian4 platforms with
QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should
also return correct value even if it doesn't get set in environment.prf.
Task-number: QTBUG-13802
Reviewed-by: Shane Kearns
Reviewed-by: Janne Anttila
|
|
|
|
| |
Reviewed-By: Oswald Buddenhagen
|
|
|
|
|
|
|
|
|
|
|
|
| |
After discussing with Intel, turns out that ICC defaults to aligning
the stack when it needs to (e.g., when issuing aligned operations), but
doesn't care otherwise. GCC, on the other hand, expects the stack to
always be aligned and will issue instructions without checking.
We'll probably add __attribute__((force_align_arg_pointer)) to some
functions in our code, but we won't be able to catch everything.
Reviewed-By: Bradley T. Hughes
|
|
|
|
|
| |
Task-number: QTBUG-13782
Reviewed-by: ossi
|
|
|
|
|
|
|
|
|
|
| |
Breakpad is a portable crash handler. It sends the raw crash
information to a server for analysis. This analysis needs debug
information. Consequently, we compile with debug info even in release
mode if qt-breakpad integration is requested (via an environment
variable).
Reviewed-by: ossi
|
|
|
|
|
|
|
|
| |
Environment.prf can contain SDK specific variable settings such as
SYMBIAN_VERSION.
Task-number: QT-3949
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added nested_exceptions.prf to the symbian mkspecs features, and used
it from the stl.prf config.
nested_exceptions.prf adds the .mmp flag to use the nested exceptions
runtime support library for apps.
stl.prf will add nested_exceptions to the config when the support
library is present. Since this check depends on the existence of the
runtime support library when qmake is run, qtp will have to add
nested_exceptions to their config when building with nested exception
support.
This change means that, where nested exceptions are supported on
Symbian, apps will no longer crash if a nested exception is encountered
at runtime.
Task-number: QTBUG-4852
Reviewed-by: Miikka Heikkinen
|
|\ |
|
| |
| |
| |
| |
| | |
Task: QTBUG-13523
RevBy: Thomas Zander
|
| |
| |
| |
| | |
RevBy: Trust me
|
| |
| |
| |
| | |
RevBy: Trust me
|
|/
|
|
|
|
| |
MeeGo graphics system helper headers are now synced and the correct
include path and libraries are added to an application by doing QT +=
meegographicssystem helper in the .pro file.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits)
make shadow builds not write into the source dir
Fix failing tst_qmdisubwindow test after 71a3b1a0d3
Doc: update the documentation of QUrl about HTML Form encoding
search translator comments
Install translators earlier in assistant
Fix compilation on ARM: don't include kernel headers
Fix compilation of qmake with MSVC
Doc: Updating known-issues page.
Recognize @, #, $ and ` as word separators
rebuild configure.exe
Fix dependencies so JOM will handle parallellization properly
Symbian: Disable IPv6 for now
Doc: Fixed namespaced Qt build breakage in the model/view tutorial.
Doc: Fixing links on index page and corecting HTML in the template.
Accept empty authority segments in QUrl as different from not-present
Doc: Adds line about non-support for Webkit on Solaris
protect nil dictionary from release.
Fix potential KERN-EXEC 0 on Symbian.
Ukrainian translation updated
Fix remote crash in delivering D-Bus calls with too few arguments
...
|