Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
*	escape backslashes	Oswald Buddenhagen	2010-05-26	1	-2/+2
\| \| \| \|	this makes windows-style path specs ugly. that's intentional. :-P
*	Fix desktopservices demo missing icon in Symbian	Miikka Heikkinen	2010-04-30	1	-1/+5
\| \| \| \| \| \| \| \| \| \|	Symbian abld toolchain cannot handle very long paths for mifconv source images, so do not absolutize the path. This should not be a problem, as the absolute icon path is only needed for shadow builds, which are not supported in symbian-abld anyway. Task-number: QTBUG-10135 Reviewed-by: Thomas Zander
*	Fixed mif generation on symbian-abld.	axis	2010-03-23	1	-1/+4
\| \| \| \| \| \|	We have to do backslash fixing because we are using QMAKE_EXTRA_TARGETS instead of QMAKE_EXTRA_COMPILERS, which in turn is needed to get clean targets correct on the symbian/* mkspecs.
*	Fixed regular expression matching.	axis	2010-03-23	1	-1/+1
\| \| \| \| \|	We need extra backslashes, otherwise it tries to match the '\|' verbatim.
*	Make ICON generation (to symbian mif) work for relative paths/shadow builds	Thomas Zander	2010-03-22	1	-0/+2
\|
*	Removed a warning about generated rss files.	axis	2010-03-16	1	-8/+8
\| \| \| \| \| \|	Also cleaned up the "clean" and "distclean" targets a bit. Task: QTBUG-8854
*	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60	axis	2010-03-16	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
\| *	Merge remote branch 'origin/4.6' into qt-4.7-from-4.6	Thiago Macieira	2010-03-15	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/styles/qs60style_s60.cpp
\| \| *	Fixed RSS_RULES statement in application_icon.prf	Miikka Heikkinen	2010-03-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RSS_RULES were being overwritten instead of being appended to in applicaton_icon.prf. Reviewed-by: Janne Anttila
* \| \|	Corrected a wrong comment.	axis	2010-02-26	1	-1/+1
\| \| \|
* \| \|	Removed restrictions on file names from the Symbian makefile system.	axis	2010-02-26	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spaces in filenames still won't work, but that is very tricky to fix because you cannot escape filenames inside the QMAKE_EXTRA_COMPILERS section. Task: QTBUG-8555
* \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-02-16	1	-1/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
\| * \|	Fixed the host detection in qmake profiles.	axis	2010-01-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The previous tests were checking the target platform, but we need to check the host. RevBy: Trust me
\| * \|	Merge branch 'merge-request-1601' into master-s60	axis	2010-01-05	1	-2/+1
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
\| \| *	Add Linux host support to Symbian mkspecs.	Anderson Lizardo	2009-11-17	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: axis <qt-info@nokia.com>
* \| \|	Implemented rss file generator for Linux.	axis	2010-02-09	1	-5/+15
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Most code was reused from the Windows generator. Icons don't currently work due to a problem with the mifconv tool. In addition backslashes were changed to slashes in all common code, since qmake seems to prefer this when doing path cleanup and the like.
* \|	Use relative paths when invoking mifconv.	Janne Anttila	2009-11-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some S60 SDK has a bug which make mifconv to crash with absolute paths. Switched to use QMAKE_FILE_IN variable in mifconv.commands instead of using join of ICON keywords. Joining is not needed anymore since ICON keyword supports only one filename. Using input variable (QMAKE_FILE_IN) also esnures that absolute path is converted to relative before invoking mifconv. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
* \|	Unified ICON keyword handling for ABLD and SBSv2 toolchains.	Janne Anttila	2009-11-19	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With SBSv2 toolchain only first file from ICON keyword is used and it is actually the right behaviour. Originally support for multiple files in ICON keyword was introduced to support localized application icons. However, in that case the different localized icons should not go to same MIF file since it is not possible to define in .rss file which icon number should be used for which language. To support a localized application icons separate MIF for each locale should be created and installation of ICON should depend on selected language. Implementing proper support for localized icons is left for another task. Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
* \|	Changed MIF filename from UID to target name in Symbian.	Janne Anttila	2009-11-18	1	-10/+20
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change makes it possible to define ICON keyword in pro file without UID3. It is safe to use target as an icon name since Symbian devices cannot have two different binaries with the same name as all binaries are located in \sys\bin. This means there cannot be also two mif files with same target name. Also all native S60 apps use target name as an MIF basename. Target name is also much easier to associate with app than UID. Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen
*	Docs: Fix spelling and reword docs about S60 specifics.	Daniel Molkentin	2009-09-22	1	-2/+3
\| \| \| \|	Reviewed-By: TrustMe
*	Review fixes for qmake (project.cpp cleanup)	Miikka Heikkinen	2009-08-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed symbian specific functionality from project.cpp: - generate_test_uid qmake function removed - Uids are now generated automatically for projects that don't have one. - Usage of ICON (in application_icon.prf) now requires explicit UID3 definition. - Autotests that require UID3 in .pro now define it explicitly - Move most symbian specific function implementations away from project.cpp to files under generators/symbian Reviewed-by: Janne Anttila
*	Long live Qt for S60!	axis	2009-04-24	1	-0/+39