| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
RevBy: Liang Qi
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-By: Oswald Buddenhagen
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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: (24 commits)
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
Ensure that OpenGL contexts are attached to an NSView before first paint
Doc: Updating the 3rd party lib used in Qt - including JQuery
Doc: Changed the default URL to avoid a Flash plugin crash on x86-64.
Reduce memory consumption of QtScript/JSC on Symbian
Doc: Updated Supported Platforms page. Finished
New binary of configure.exe with -mp/-no-mp option
Turn Makefile.win32 into batch-mode, enable /MP and PCH
Add option to enable -MP compile option for MSVC
Rewrite ucstrcmp in terms of ucstrncmp
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The option is on when building Qt, but off by default for other
projects, due to potential incompatible compile options in other
projects. (/E, /EP, /Gm, /Yc, /showIncludes, #import preprocessor
directive)
Reviewed-by: bhughes
Reviewed-by: ossi
|
|/
|
|
|
|
|
|
|
| |
Plenty of filenames got generated with spaces which didn't work
as that was not taken into account. Harmonized TARGET fixing
across prf files and qmake Symbian generator code.
Task-number: QTBUG-13363
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
| |
put each step into a separate make command.
that makes for cleaner output and less troubles with command separators.
Reviewed-by: mariusSO
|
|
|
|
|
|
|
|
|
| |
Removed usage of buggy .release_gcce target from symbian-sbsv2
generated makefiles. Now gcce builds like armv5 as it is supposed to
when using Raptor.
Task-number: QTBUG-13307
Reviewed-by: axis
|
|
|
|
|
| |
Task-number: QT-2139
Reviewed-by: Gunnar Sletta
|
|
|
|
|
|
|
|
|
| |
Dependencies got generated wrong in Makefile because sis is always
created in the .pro file directory but dependency included path
that was in TARGET.
Task-number: QTBUG-12884
Reviewed-by: Shane Kearns
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits)
Disable minRightBearing optimization in QTextLayout on Mac
Added one test for QRegExp
QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given.
Add text decoration support to QStaticText
Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator
QtDeclarative: get rid of warnings in public header
doc: Clarify documentation of QStaticText
Fix scrollbar randomly popping up in QPlainTextEdit
Remove the definition of QT_HAVE_NEON from qt.prf
Use the fast Neon conversion for converting colors of jpeg images.
Do the conversion from RGB888 to RGB32 using Neon
Move the build of Neon file from painting.pri to gui.pro
QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads
compilation with QT_NO_DEPRECATED
Test we do not have compiler warnings in our headers with more options
QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff
Doc: Fixed qdoc warnings.
Fix QTextEngine overflow caused by extremely long text
Replace the SSE prologues by a macro
QDom: Do not crash on "<a:>text</a:>"
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
Add text decoration support to QStaticText
Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator
QtDeclarative: get rid of warnings in public header
doc: Clarify documentation of QStaticText
Fix scrollbar randomly popping up in QPlainTextEdit
Remove the definition of QT_HAVE_NEON from qt.prf
Use the fast Neon conversion for converting colors of jpeg images.
Do the conversion from RGB888 to RGB32 using Neon
Move the build of Neon file from painting.pri to gui.pro
QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads
compilation with QT_NO_DEPRECATED
Test we do not have compiler warnings in our headers with more options
QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff
Doc: Fixed qdoc warnings.
Fix QTextEngine overflow caused by extremely long text
Replace the SSE prologues by a macro
QDom: Do not crash on "<a:>text</a:>"
Doc: Fixed typo.
Doc: Fixed QML documentation errors.
Doc: Merged in some of Thomas Zander's suggestions.
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since we cannot use NEON and VFP concurrently, it is better not to
force neon all over the place :)
Reviewed-by: Andreas Kling
Reviewed-by: Thiago Macieira
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
do it in qt_config.prf instead of in the autogenerated qconfig.pri
files. this is waaaay more elegant, and allows us to easily use the
magic in that file which avoids loading qt configuration from the qt
install dir while building qt itself.
Reviewed-by: joerg
Reviewed-by: Simon Hausmann
Task-number: QTBUG-12698
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
they are already loaded in qconfig.pri, which is loaded from
qt_config.prf, which is explicitly loaded by every qmake spec.
Reviewed-by: Simon Hausmann
Reviewed-by: joerg
|
|/ /
| |
| |
| |
| | |
Reviewed-by: joerg
Reviewed-by: Simon Hausmann
|
|/
|
|
|
|
|
| |
Sis files are always generated in the pro file directory even if
TARGET indicates another target directory.
Reviewed-by: axis
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use the fast conversion from RGB888 to RGB32 for Jpeg images
Move the SIMD defines to the common declaration of Qt symbols
Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORT
|
| |
| |
| |
| |
| |
| |
| |
| | |
Move the #defines for the SIMD extension to the common code
in order to be able to use them from any module without copying their
definition.
Reviewed-by: Andreas Kling
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem with hardlinks is that things start to behave funny when
you build several times, because on the next compile, the target from
armlink is moved to the .sym file location, and in this case it will
be hardlinked too. In the end you have all three files (bare, .exe
and .sym) being hardlinked together, when the .sym should be an ELF
file and the other two should be an E32 image.
RevBy: Trust me
|
| |
| |
| |
| | |
RevBy: Miikka Heikkinen
|
|/
|
|
|
|
|
|
|
| |
Platform paths provided by Symbian do not provide the full path to
headers. Ideally they should be used, by looking for and replacing
/epoc32 with the correct path. However, for now this is a good enough
solution.
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
| |
Dependencies to dso files were not generated correctly, both because
the PRE_TARGETDEPS variable seems to be local to the function it was
in, and also because the regular expression was wrong (it has to
match the whole string).
Also switched to qt_ style variable names to avoid clashes.
RevBy: Trust me
|
|
|
|
| |
This reverts commit ebe6a5238947c30a613b61b521cb0d094efa2d02.
|
|
|
|
| |
RevBy: Markus Goetz
|
|
|
|
|
| |
Task: QTBUG-11927
RevBy: Trust me
|
|
|
|
|
| |
Task: QTBUG-11927
RevBy: Trust me
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
|
|
| |
Previously, the variable would be appended too soon, so not all
values would be included. Now it is one of the last steps.
RevBy: Trust me
|
|
|
|
| |
RevBy: Trust me
|
|
|
|
|
| |
Reviewed-by: joerg
Task-number: QTBUG-11752
|
|
|
|
|
| |
Task: QTBUG-11396
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
|
| |
Executing "make deploy" will recreate project sis file and deploy it
into a device.
Task-number: QTBUG-5155
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
| |
So it would not find elf2e32_qtwrapper
use the qtPrepareTool macro that does the right thing.
But this macro need QT_BUILD_TREE to be defined, which is not defined
yet early in the test process. So change the tests accordingly
Reviewed-by: ossi
|