summaryrefslogtreecommitdiffstats
path: root/src/tools/bootstrap
Commit message (Collapse)AuthorAgeFilesLines
* Consolidate zlib configuration redundancyMark Brand2010-07-021-19/+2
| | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Updated project files so it is now possible to use "-system-zlib" ↵Constantin Makshin2010-06-102-2/+7
| | | | | | | | | configuration option on Windows and Symbian platforms. Improved support of "-system-jpeg" "-system-mng" "-system-png" and "-system-tiff" configuration options on Windows (thanks to Mark Brand <mabrand@mabrand.nl>) Merge-request: 2411 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-192-3/+22
|\ | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * Added Symbian def file support to Linux build system.axis2010-03-082-2/+10
| | | | | | | | | | | | | | | | | | | | | | This also switches the official def file variable in qmake profiles to DEF_FILE. Support for freezing def files was also added, but needs more work and is therefore disabled for now. Task: QTBUG-7510 Task: QTBUG-8052
| * Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-232-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sis target will depend on the main build target of each project, which should make it possible to simply run "make sis" in the root of a clean tree (after configure, of course), and have sis packages generated for everything. It works at least for Qt. This required some changes to the dependency generation in Qt, to make sure that s60installs builds its package after all of Qt, and that fluidlauncher has all the required files before building a package. In addition, all the sis target code was moved into its own qmake feature file, called sis_targets. It is currently enabled by default for Symbian.
| * Make link bootstrap again.Thomas Zander2010-02-081-2/+2
| | | | | | | | Fix the borked fix and re-add the dollar signs.
| * Fix linking for armlinkThomas Zander2010-02-041-3/+3
| | | | | | | | | | | | | | | | using LIBS += -LanyDir is wrong as that depends on 'ld' accepting -L the correct cross-platform approach is to use QMAKE_LIBDIR += anyDir
* | Force qt-zlib to be used for host system when cross compiling.Zeno Albisser2010-03-172-2/+2
|/ | | | | | | | | There is no possibility to define which zlib should be used for the bootstrapped tools when cross compiling. Therefor we will force qt-zlib to be used for bootstrapped tools. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-8678
* Fix build on AIX: all of the .a file is linked into the program.Oswald Buddenhagen2009-11-241-7/+3
| | | | | | | | | The qlibraryinfo.cpp is only needed by lrelease. It has a hack for qmake_libraryInfoFile(), which doesn't work on AIX. So don't put qlibraryinfo.cpp in libbootstrap.a, but instead build directly for lrelease. Reviewed-by: thiago
* fix shadow builds following bootstrap changesOswald Buddenhagen2009-11-121-0/+1
|
* build lrelease bootstrappedOswald Buddenhagen2009-11-102-3/+7
| | | | | | | | needed for build-time qm generation in qt itself. the downsides are a) that the other bootstrapped tools grow by ~12kB (on x86) due to qdatastream being pulled in by qbytearray and qstring and b) that lrelease isn't l10n'd itself anymore (the latter could be fixed by building a non-qobject qtranslator).
* Rename qlistdata.cpp (back) to qlist.cpp.Volker Hilsheimer2009-08-171-1/+1
| | | | | | | | In the old days, some compilers would implicitly include the *.cpp file if the *.h file contained templates. That's why we had qlistdata.cpp not qlist.cpp. Those compilers are no longer supported. Rev-by: Harald Fernengel
* Replace instances of weak linking for 10.3 with 10.4.Morten Sorvig2009-08-061-1/+1
|
* make the boostrap lib work for projects that aren't in src/toolsJoerg Bornemann2009-07-201-10/+10
| | | | | | | This is preparation for making Windows CE checksdk use the bootstrap lib. Reviewed-by: thartman
* Long live Qt!Lars Knoll2009-03-232-0/+178