| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
fix "configure -fast" on Windows for other maketools than nmake
Get qmake to add pdb files to install target in debug configuration.
add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX
give symbian an own platform mode
deprecate -win32/-unix/-macx which set both host and target mode
decouple host platform mode from target platform mode
factor out applyHostMode()
make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins
use QDir::separator() instead of Option::dir_sep where appropriate
simplify string ops
sanitize evaluation of OS scopes
instead of hard-coding recursion for symbian, add it to the specs
add possibility to request project recursion from within a pro file
fix ts-assistant target
use QList::reserve() as appropriate
optimize appending of (empty) lists to (empty) lists
suppress pointer aliasing warnings
Fix compilation with namespace.
Assistant: Make ~AbstractHelpViewer() virtual.
Prepare German translations for 4.7 (except Quick).
...
|
| |
| |
| |
| |
| | |
Merge-request: 2105
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| | |
... instead of using the gross isForSymbian() magic
Reviewed-by: mariusSO
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
derive the host mode from the generator - this doesn't work *too* well
if the mode is different from the real host platform, so it's only for
testing.
get the target platform mode from the qmakespec, falling back to the
host platform mode.
Reviewed-by: mariusSO
|
| |
| |
| |
| | |
Reviewed-by: mariusSO
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
this is the same as specifying -r on the command line, but it can be set
in pro and spec files for cases where no recursion would plain not work.
the implementation is via a new option() instruction which at some point
will be used to set other "modes of operation" as well. for now, only
the "recursive" option is recognized.
Reviewed-by: mariusSO
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| |/ /
| | /
| |/
|/|
| | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
(cherry picked from commit 6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
(cherry picked from commit 5254184c07b4da800e29000a251ed2a026bd2be5)
Conflicts:
qmake/Makefile.unix
|
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7.
Conflicts:
qmake/Makefile.unix
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64.
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (323 commits)
Doc: these files are NOT part of the test suite of the Qt toolkit
Autotest: make the licenseCheck test also check .qdoc files
use egl properties when creating surfaces on symbian
work around the current include file structure on Symbian^3
Get rid of the dependency on the Symbian app layer
Fix incorrect license headers
Fix incorrect license headers
tst_qnetworkreply: Check if TCP/HTTP connection got re-used
Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1
Fix building in a namespace on Windows
Supressed Icon sizes on QPushButton in QS60Style
Ensure that posted events are sent on Windows
Fixed off-by-one blending errors in the NEON drawhelper code.
Fixed libstdcpp.dll version autodetection for Symbian
Fixed linkage failure when building qmake on Unix platforms
Factored epocRoot implementation out of qmake
Factored readRegistryKey implementation out of qmake
Cetest extensions for Windows Mobile device power operations.
Remote lib extensions for Windows Mobile device power operations.
ColorDialog is always shown as stripped-down version (for QVGA)
...
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/corelib/codecs/qtextcodec.h
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
This was done in order to use the same targets for multiple mkspecs.
The "store_build" target of sbsv2 had to remain separate, because it
depends on using flms.
RevBy: Miikka Heikkinen
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
littering generic makefile generator code with it is both plain ugly and
unnecessary.
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Acked-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-By: mariusSO
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
|
| |\ \ \
| | |_|/
| |/| | |
|
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/|
| | |
| | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- 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
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|