| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The .flags modifier can be used to specify pkg flags for files.
For example, to make default application run after install:
default_bin_deployment.flags += FR RI
For example, to show a note at installation time:
notedep.sources = install_note.txt
notedep.flags = FT TC
DEPLOYMENT += notedep
See Symbian package file format documentation for exact supported
flag values.
Task-number: QTBUG-13367
Reviewed-by: Janne Anttila
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
Task-number: QTBUG-13367
Reviewed-by: axis
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msbuild_objectmodel.h
qmake/generators/win32/msvc_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/arch/qatomic_arm.h
tests/auto/qglthreads/tst_qglthreads.cpp
|
| | |
|
| |
| |
| |
| | |
Reviwed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Commit 3ed9e2788e8 changed the logic from using lookahead to checking
if the library already existed in the arguments parsed so far. This
broke the case -lFoo -lBar -lFoo where Bar depends on symbols in Foo.
Since we were reducing this to -lFoo -lBar, the linker would not know
which missing symbols to include from Foo when encountering the -lFoo
argument.
We now keep the library order when building the final argument list,
by making sure the position of a duplicated library is always that
of the last instance of that library.
Task-number: QTBUG-13944
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
there is no point in &&-ing it with a possibly present signature command
- putting it on a line of its own works just fine - with the added
benefit of not breaking if it contains operators itself.
Reviewed-by: mariusSO
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
instead of glueing the commands with "&&" and having a monster hack
(\r\h) for the case where they cannot be and-ed, glue them with newlines
and error checks. this ensures that we a) never have excessively long
lines, b) don't need the monster hack and c) commands always have proper
error checks, just like in makefiles.
Reviewed-by: mariusSO
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/snippets/code/doc_src_qmake-manual.qdoc
src/corelib/arch/symbian/arch.pri
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (231 commits)
Fixed compile warning on Windows.
Fixed painter path drawing on FBO without stencil buffer.
qmake: Make smart library merge architecture-aware
Slovenian translation: some updates and fixes
Fixed memory leak in Symbian when Options menu was launched.
Fixed color of cosmetic pens when printing under Windows.
Fixed infinite loop when loading jpeg without EOI from memory.
Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).
Added galician translation
Support multisampled pbuffers under Windows.
tst_qpixmapfilter: Fix compilation in namespace
qtextcodec_symbian: Add few aliases
Give a warning in QPixmap::handle() if pixmap is not X11 class.
Make QStaticText honor QPainter::pen() for rich text on X11 w/raster
Fix one hang of QNAM on Symbian.
Update QtDeclarative def files
Update QtGui def files
Update QtCore bwins def file
Fix Symbian def file for a9e5329168
Make build on Symbian
...
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qmake's smart library merge would not take Xarch into account, so lines
like -Xarch_i386 -foo -Xarch_ppc -foo would be reduced to -Xarch_i386
-Xarch_ppc -foo, due to the "duplicate" -foo.
The explicit addition of the -Xarch option for each entry of the
architecture specific options is intentional, to make cases like
"-Xarch_i386 -framework Foo" magically work.
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QT_RVCT_VERSION environment variable can be used to specify
the desired RVCT version for symbian-sbsv2 Makefiles:
E.g. QT_RVCT_VERSION=4.0, release-armv6 -> sbs -c arm.v6.urel.rvct4_0
If no version is specified, generic sbsv2 rvct aliases are used just
like before:
E.g. release-armv6 -> sbs -c armv6_urel
Version specific make targets are also generated for each detected
compiler:
E.g. release-armv6-rvct4.0 -> sbs -c arm.v6.urel.rvct4_0
Also optimized finding the installed compiler versions.
Task-number: QTBUG-13499
Reviewed-by: axis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Commit 019032c93b7397c7239ec99ec44b4923df31533b introduced a lot of
annoying error messages when configuring Qt. It makes qmake complain
that it cannot find rcc and uic, which aren't yet built at this point.
We're now checking for the existence of the depend_command if it is
given as absolute path. This is the case for uic and rcc.
Yeah this is a weak solution for sick code.
Task-number: QTBUG-13366
Reviewed-by: ossi
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
this magic is a bit braindead anyway, but whatever.
Reviewed-by: joerg
Task-number: QTBUG-13366
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
With this variable one can set the project name for IDE project files.
Currently only used for Visual Studio
Task-number: QTBUG-3206
Reviewed-by: ossi
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
demos/declarative/snake/content/snake.js
demos/declarative/snake/snake.qml
doc/src/development/qmake-manual.qdoc
src/corelib/plugin/plugin.pri
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qdesktopwidget_win.cpp
src/gui/painting/qdrawhelper.cpp
tests/auto/qdir/tst_qdir.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
|
| |
| |
| |
| |
| |
| |
| |
| | |
Renaming makefile makes little sense for Symbian toolchains, when
we generate so many other files filenames derived from other sources.
Task-number: QTBUG-13336
Reviewed-by: Janne Anttila
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- No longer require PRE_TARGETDEPS items to be absolute, which was
difficult to achieve sometimes as qmake doesn't provide method
for absolutizing paths.
- Do smart command replacement for commands containing $$QMAKE_*
command variables, such as $$QMAKE_COPY, when generating bld.inf
extensions for QMAKE_EXTRA_* variables.
$$QMAKE_* command variables cannot be passed to sbsv2 toolchain
directly, as it uses cygwin in windows, and they can't simply
be replaced to use sbsv2 equivalents in symbian.conf, because
generated wrapper makefiles need them to be Windows compatible.
Reviewed-by: axis
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
Autodetection was unreliable and there was no practical way to make
it reliable even for common cases, so it was removed.
Task-number: QTBUG-13498
Reviewed-by: Janne Koskinen
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (474 commits)
Different version from the previous patch: use QElapsedTimer
Compilation after merge.
Correct last right bearing in boundingBox(glyphs)
Make sure propagated font in QGraphicsWidget can be set on a QPainter
Apparently QPen::brush() can't return a NoBrush for a NoPen.
Updated some URLs and required tools versions for Symbian
Cleanup
Remove pointless \internal docs (that contain no information)
Remove pointless \internal docs (that contain no information)
Internal QML API cleanup
Update example screenshot in doc.
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
use QFile:map instead of ::mmap
Added support for DEPLOYMENT.pkg_build_version
Do not use global static const references to objects
Autotest: don't use Q_FUNC_INFO for testing which method got called
fix for memory leak in QSysInfo::s60Version()
fix generated makefile dependencies
Cocoa: Demo browser can get stuck after closing modal dialog
...
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits)
Autotest: don't use Q_FUNC_INFO for testing which method got called
fix generated makefile dependencies
Cocoa: Demo browser can get stuck after closing modal dialog
Restore default if to system default on session close.
tst_qmake doesn't need QtGui
Use the full path to qmake in the qmake unit test
qdoc: Fixed erroneous links to QML basic types.
Fixed item view background color in Gtk style
scope fixes and clutter reduction for sql driver projects
I don't know why some linkers can't call this function, so comment it out.
QNetworkSession::close() method now send closed() signal while faking disconnection.
Add the missing license headers to the QString benchmark data
Fix building of qsimd.cpp on Windows CE
Use QElapsedTimer for the benchlib tests.
Properly implement the CPU feature disabling in qsimd.cpp.
Report the detected CPU features in the corelib boilerplate
Detect CPU features on ARM by reading the ELF auxvec.
Split the CPU-detection code into multiple functions for readability
Fixed delivering gestures to a toplevel widget.
Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result
...
|
| | | |
| | | |
| | | |
| | | |
| | | | |
seems like some makes are rather lax about bogus dependencies, so this
went unnoticed in local testing for at least two people.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13081
Reviewed-by: Martin Petersson
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13080
Reviewed-by: Martin Petersson
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
like in SUBDIRS, the specified strings can now be basenames of
"structures" which specify the actual input and output files:
QMAKE_SUBSTITUTES += test
test.input = infile.txt.in
test.output = foobar.out
Reviewed-by: joerg
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added support for DEPLOYMENT.pkg_build_version
fix for memory leak in QSysInfo::s60Version()
|
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
DEPLOYMENT.pkg_build_version can be used to pad the patch version
number in Symbian pkg files to allow hot-fix deployments to be done
between patch releases.
DEPLOYMENT.pkg_build_version accepts only values 0 - 99, as pkg patch
version number has limits how large numbers it can accept. The specified
number is prefixed with zero if it is single digit and then appended
to patch version number.
Task-number: QTBUG-13147
Reviewed-by: Janne Koskinen
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
Conflicts:
bin/syncqt
src/opengl/qgl.cpp
tools/configure/configureapp.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Basically replacing project->values("foo").first() with
project->first("foo") which does a null check.
Task-number: QTBUG-12851
Reviewed-by: ossi
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Pkg_prerules and pkg_postrules can now be targeted to apply only to
main template pkg, installer pkg, or stub pkg file using
.main, .installer, or .stub suffix on the variable.
Also clarified documentation of these variables.
Task-number: QTBUG-13159
Reviewed-by: axis
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
src/opengl/opengl.pro
src/opengl/qgl_p.h
src/plugins/bearer/connman/qconnmanservice_linux.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/assistant/tools/assistant/openpageswidget.h
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12807
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Don't add the PDB file name to ForcedIncludeFiles.
Task-number: QTBUG-12802
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | | |
it wasn't the fault of fileFixify() after all ...
Reviewed-by: joerg
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When QMake decides to use absolute path for some object file, this
code used to leave the ADDMOD command out from the ar object script,
which resulted in following errors from the issued "ar -M" command:
Syntax error in archive script, line 2
Syntax error in archive script, line 3
etc...
And the build failed in the linking phase, because the generated
static library was empty.
Fix this issue by prepending the file name with ADDMOD command even if
the file path is absolute.
Task-number: QTBUG-12959
Merge-request: 2451
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
still doesn't work for nested directories, but that's because
fileFixify() is plain broken.
on the way, remove a superfluous check: we know that the input file name
ends with .in - three lines up we made sure it does.
Reviewed-by: joerg
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously check to remove files from deployment in case the deployment
target location was the same as the source location was done using
QFileInfo equality, which resolved to true when file didn't yet exist
at the time qmake was run. Changed the check to compare absolute paths
instead.
Task-number: QTBUG-12879
Reviewed-by: Shane Kearns
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qpainter.cpp
src/gui/text/qtextengine.cpp
tests/auto/qimage/tst_qimage.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changes to .pro file weren't previously noticed and therefore
qmake wasn't rerun. Qmake command itself was also incorrect.
Task-number: QTBUG-12716
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It is now possible to use "release-gcce" and "debug-gcce" targets
in symbian-sbsv2 mkspec. Exports and cleans should also now work
properly for all target platforms under symbian-sbsv2.
Task-number: QTBUG-12762
Reviewed-by: Jason Barron
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Mmp and mk files previously contained UID3 as unique identifier in
the filename. However, this was not particularly useful for building
subprojects in massive project trees such as Qt, as it was difficult
to remember UID for each subproject. Now with intuitive naming of mmps,
it is possible to build a subproject like this:
sbs -c armv6_urel -p qtcore_dll.mmp
Task-number: QTBUG-12715
Reviewed-by: Jason Barron
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Missing minor or patch value from VERSION caused malformed pkg header
to be generated.
Task-number: QTBUG-12617
Reviewed-by: axis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
MSVCPROJ_CXXFLAGS removed. This was unused.
MSVCPROJ_LFLAGS removed. This was used to convert the values of
QMAKE_LFLAGS, QMAKE_LIBDIR and DEF_FILE to linker command line options.
Then they were converted back to set values in the object model.
This journey to the world of command line options isn't necessary...
Reviewed-by: ossi
|