| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: fix typo
QCompleter: fix misuse of QMap that can lead to crashes
qmake: added possibility to specify the type of an install target
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Before this change:
target.CONFIG+=no_check_exist implies the file is a file, no way to
make an install rule for a non-existing directory.
Now, its possible to specify the type:
target.CONFIG+=no_check_exist directory
will install a directory.
target.CONFIG+=no_check_exist executable
will install an executable.
target.CONFIG+=no_check_exist data
will install a normal file.
The default case, if no type is given, like in
CONFIG+=no_check_exist
will call QFileInfo::isExecutable() to determine, if its a data file
or executable. This is the old behaviour.
Task-number: QTBUG-10624
Reviewed-by: ossi
|
| |/
|
|
| |
Reviewed-by: ossi
|
| |
|
|
|
|
|
|
|
|
|
| |
There are valid cases where Qt .flm files found under
/epoc32/tools/makefile_templates/qt/ have newer timestamp than those
in Qt repo one is developing against but still need to be overwritten,
so always export .flm files when the timestamp is different instead of
just when the files to be exported are newer.
Task-number: QT-3253
Reviewed-by: TrustMe
|
| |
|
|
|
|
| |
Added missing libraries
Reviewed-by: Marius Storm-Olsen
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
VERSION_FLAGS.<keyword> can now be used for all compilers and not
just armcc, and version flagging can now be used with QMAKE_LFLAGS
as well as QMAKE_CXXFLAGS.
Also, MMP_OPTION_KEYWORDS variable is used to define supported keywords
for OPTION and LINKEROPTION statements, which are defined via
QMAKE_CXXFLAGS.<keyword> and QMAKE_LFLAGS.<keyword> variables.
This improves flexibility in the future if new keywords need to be
supported.
Task-number: QTBUG-8685
Reviewed-by: Janne Koskinen
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
VERSION_FLAGS.ARMCC variable is used in symbian.conf to define
supported armcc compiler version flags. Values given to this
variable must be directly usable as ifdef flags in mmp.
QMAKE_CXXFLAGS.<version flag> variables can now be used to add
compiler options to specific compiler versions.
Note that options added via QMAKE_CXXFLAGS.ARMCC flag
will apply to all versions of armcc compiler.
Task-number: QTBUG-8685
Reviewed-by: Iain
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The pkg statements were generated in invalid order if user used
pkg_prerules to redefine languages supported by the pkg file.
Also made it possible to override dependency statements autogenerated
for Qt and QtWebkit, as these statements need to be user defined in
case of multiple languages.
Defining the following in .pro removes all dependencies from pkg rules:
default_deployment.pkg_prerules -= \
pkg_depends_webkit \
pkg_depends_qt \
pkg_platform_dependencies
Task-number: QTBUG-9279
Reviewed-by: Janne Anttila
|
| |
|
|
|
|
|
|
|
|
| |
Since the build process copies everything that is deployed using
DEPLOYMENT variable under epoc32 somewhere, pkg files might as well
look for the files from there. This can be useful for binary
releases if the release needs to be repackaged.
Task-number: QT-3147
Reviewed-by: Janne Anttila
|
| |
|
|
|
|
|
|
|
|
|
|
| |
When using recursive QMAKE_EXTRA_TARGETS, qmake will use CHK_DIR_EXISTS
and MKDIR when ensuring each subdir has a Makefile created.
These previously weren't defined for Symbian.
Note that this problem was hidden in most cases, because a `qmake -r'
would have created the necessary makefiles already. The problem is revealed
when a .pro file does SUBDIRS+=foo.pro and foo.pro is also a subdirs project.
Reviewed-by: Michael Goddard
|
| |
|
|
|
|
|
|
| |
change b37ac454832a23c17418f5ebca8928b63fe02289 changed sis file names
from qt_debug-armv5.sis to qt.sis
This updates the runonphone make target to the new sis file name
Reviewed-by: axis
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added support for the following RSS_RULES variables to improve control
over placement of user defined rules inside application registration
resource file:
RSS_RULES.header - Rule placed before APP_REGISTRATION_INFO
RSS_RULES.footer - Rule placed after APP_REGISTRATION_INFO
RSS_RULES.service_list - Rule placed inside a SERVICE_INFO item
in the service_list of APP_REGISTRATION_INFO
RSS_RULES.file_ownership_list - Rule placed inside a
FILE_OWNERSHIP_INFO item in the file_ownership_list
of APP_REGISTRATION_INFO
RSS_RULES.datatype_list - Rule placed inside a DATATYPE item in the
datatype_list of APP_REGISTRATION_INFO
Task-number: QT-3083
Reviewed-by: Janne Anttila
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QHostInfo: Forgot to free some stuff on application exit.
Readd a line that got removed by accident in previous change
Ensure that a library path with a space in it gets quoted on Windows
|
| | |
| |
| |
| |
| |
| |
| | |
A line got removed by accident in the change
f3af7b746221cb44899f3e433659791f75255f21, this patch readds it back.
Reviewed-by: TrustMe
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
This was not happening when -L and -l was used and the path specified
with -L was quoted. It would lose the quotes when combining it to get
the full path for the library it found.
Task-number: QTBUG-2433
Reviewed-by: Marius Storm-Olsen
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In Symbian, it is now possible to set certain subdirs to be built
only when specified define is true when bld.inf is parsed.
For example, compile a subdir only when building for emulator:
SUBDIRS += winscw_lib
winscw_lib.condition = WINSCW
Also improved SUBDIRS variable documentation; the modifiers were
completely undocumented.
Task-number: QT-3017
Reviewed-by: axis
|
| |
|
|
|
|
|
|
|
| |
It is necessary to specify this variable conditionally sometimes,
which requires use of MMP_RULES, so allowed overriding it without
warning.
Task-number: QT-2909
Reviewed-by: Janne Koskinen
|
| |
|
|
|
|
|
|
|
|
| |
QFileInfo::isDir() will not return correct value if path doesn't exist
like it doesn't in case of clean builds. Turned the check around
and used isFile() instead. If a file is given as origPath, it is
assumed to exist, because it was explicitly given with HEADERS variable
and qmake will give warning if nonexisted file is given there.
Reviewed-by: Janne Koskinen
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
1) FLMs should not have more than one phase dependency -> removed extra
dependencies, leaving only what is actually necessary.
2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete
3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm
so that unrelated components can continue building instead of
halting the whole build at EXPORT phase.
4) Added .export to qmake_extra_pre_targetdep interface so that it is
actually executed in EXPORT phase where it should be.
Task-number: QTBUG-8513
Reviewed-by: Janne Koskinen
|
| |
|
|
|
|
|
|
| |
Prj_extensions tag is replaced with prj_testextensions tag when
CONFIG contains symbian_test
Task-number: QT-2985
Reviewed-by: Janne Koskinen
|
| |
|
|
|
|
|
|
|
|
| |
Deploy everything currently deployed under /epoc32/winscw/c to also
under /epoc32/data/z to make is easier to deploy applications to ROM.
Also changes path separators in deployment generation to be Linux
friendly.
Reviewed-by: Janne Anttila
|
| |\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Changed canonical paths to absolute paths in symmake.
Don't use vgClear() for semi-transparent brushes.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Canonical paths were resolving to empty if the paths didn't exist,
which causes problems for clean platform builds. Using absolute paths
instead will generate all required paths.
This will cause a minor inconvenience of warnings about some nonexistent
paths during makefile generation phase of abld builds, but this is
unavoidable. Sbsv2 builds do not display any warnings.
Reviewed-by: Janne Anttila
|
| |/ |
|
| |
|
|
|
|
| |
Commits f641369c/5254184c and 13cb80be/6ebcf2c2 caused registry.o
and epocroot.o respectively to be included twice during the
linkage step of qmake/Makefile.unix.
|
| |
|
|
|
|
|
|
|
|
|
| |
This function is now implemented in its own source file, rather
than being embedded within the Symbian qmake generator.
The motivation for this is to allow code to be shared between
qmake and configure - the latter needs to determine the epoc
root path in order to perform feature detection on Symbian SDKs.
Reviewed-by: Miikka Heikkinen
|
| |
|
|
|
|
|
|
|
|
|
| |
This function is now implemented with its own header and source
files, rather than being embedded within the MSVC qmake generator.
The motivation for this is to allow code to be shared between
qmake and configure, both of which query the registry when built for
Windows.
Reviewed-by: Miikka Heikkinen
|
| |
|
|
|
|
| |
This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7.
It breaks non-Symbian platforms.
|
| |
|
|
|
|
| |
This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64.
It breaks non-Symbian platforms.
|
| |
|
|
|
|
|
|
|
|
|
| |
This function is now implemented in its own source file, rather
than being embedded within the Symbian qmake generator.
The motivation for this is to allow code to be shared between
qmake and configure - the latter needs to determine the epoc
root path in order to perform feature detection on Symbian SDKs.
Reviewed-by: Miikka Heikkinen
|
| |
|
|
|
|
|
|
|
|
|
| |
This function is now implemented with its own header and source
files, rather than being embedded within the MSVC qmake generator.
The motivation for this is to allow code to be shared between
qmake and configure, both of which query the registry when built for
Windows.
Reviewed-by: Miikka Heikkinen
|
| |
|
|
|
|
|
|
| |
We should always use forward slash as a directory separator in include
paths - it's not OS dependant.
Task-number: QTBUG-8308
Reviewed-by: Alessandro Portale
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
qmake - add targets to wrapper make file
make stub_sis
createpackage - use -s or --stub to run makesis with the -s argument
also copies the file to the right place in epoc32\data\system\installs
qt.iby - add qt_stub.sis and qt_webkit_stub.sis
Task-number: QTBUG-6570
Reviewed-by: Miikka Heikkinen
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed some global QIcon/QPixmap instances that leaked handles on X11.
Speed up QListView test
QListView: fix crash when hiding many of the lasts item in a QListView
Fixed warnings and crash when painting graphics effects outside scene.
Stabilize QLineEdit test on X11
(sqlite) Allow shared cache mode
Make generate uid3 (symbian) work on 64 bit host platform.
Updated the docs for QPainter::begin/endNativePainting()
Compile fix for network benchmarks.
Add a pixmap modification hook to blur pixmap filter cache
Delete benchmark examples (qtestlib-simple and qtwidgets).
Restructure tests/benchmarks directory.
Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
QLineEdit: regression: read-only line edits would eat shortcuts.
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
Fixed bug where GL widget was not fully updated on Vista.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
On a 64 bit system the old code used to make; UID "0xEffffffff9d8cb14". Which
doesn't get accepted by the symbian tool chain ;) The patch makes this normal
size hex uid3 again.
Reviewed-by: Miikka Heikkinen
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Setting some parameters to reliably run on Tb9.2,
Streamlined smart installer package creation in Symbian
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
"make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct
Task-number: QTBUG-8026
Reviewed-by: axis
|
| |/
|
|
| |
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Another fix for the non unified title+toolbar regarding text under icons
My 4.6.2 changes
Added my changes to changes file.
Doc: Correcting image
My changes for 4.6.2
My changelog for 4.6.2
My Changelog entries for 4.6.2
Add the QMAKE_FILE_EXT variable to extra compilers generation.
Doc: Removed promisse to fix a problem
Add some entries to the change log
Change log updated
Improve raster graphics system performance on Mac (second try).
I10n/German: Update translations for 4.6.2
I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb
|
| | |
| |
| |
| |
| |
| |
| |
| | |
This give the possibility to get the file name with the extension and
without the path.
Reviewed-by: Joao
Reviewed-by: Marius Storm-Olsen
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-7908
Reviewed-by: TrustMe
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed QFileInfo::absolutePath() warning when running "qmake -project"
QTcpServer: Clarify thread affinity of incoming QTcpSocket
Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.
Updated my changelog entry
QNAM HTTP: Fix bug related to re-sending a request
Adding my changes.
Remove erroneous warning in QFileInfo::absolutePath()
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-7176
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant examples: Fix missing QLatin1String.
Added Czech translations.
Webkit: Fix missing namespace.
qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN
qmake: fix warnings
qmake: Remove macro and simplify string expression previously using it
qmake: use isActiveConfig() instead of hand-crafting comparisons
Fix missing namespace.
Assistant: Fix spelling mistakes.
Assistant: Use const references in foreach loops.
optimization: get rid of QString::fromUtf16() usage
document QString::fromUtf16() slowness
remove duplicated calculation of length
remove pointless conditionals
micro-optimization
optimize qhash()
Designer/uic/related examples: Fix source code scanning issues II.
|
| | |
| |
| |
| |
| |
| | |
patch by David Faure
Reviewed-by: mariusSO
|
| | |
| |
| |
| |
| |
| | |
missing braces, parens and spaces denoting empty loop bodies
Reviewed-by: mariusSO
|
| | |
| |
| |
| |
| |
| | |
also fixes a warning
Reviewed-by: mariusSO
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
ensures consistent handling of CONFIG values.
this is incompatible with 4.6.1, as it removes case-insentitivity from
some of the config keys, but those pro files wouldn't be portable beyond
symbian anyway, and symbian compatibility guarantees start with 4.6.2.
Reviewed-by: mariusSO
|
| |/
|
|
|
|
|
|
|
|
|
|
| |
DEPLOYMENT.manufacturers variable can be used to define manufacturer
identifiers.
DEPLOYMENT.manufacturers.fail_note variable can be used to define
a file that contains the text to be shown in case of failed
manufacturer check.
Task-number: QTBUG-7695
Reviewed-by: Janne Koskinen
|
