summaryrefslogtreecommitdiffstats
path: root/configure.exe
Commit message (Collapse)AuthorAgeFilesLines
* rebuild configure.exePeter Hartmann2010-09-031-0/+0
| | | | after change 0c7d5d10615, "Symbian: Disable IPv6 for now"
* New binary of configure.exe with -mp/-no-mp optionMarius Storm-Olsen2010-09-021-0/+0
| | | | Reviewed-by: trustme
* fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-0/+0
| | | | | | | | | | | | | | | it didn't work for several reasons: - if the configures don't add webkit to QT_CONFIG, src.pro doesn't even know that it needs to build WebKit at all, so WebKit would never inject itself into the build. hen-and-egg problem. - the in-Qt build doesn't use WebKit.pro in the first place, so a proper recursive qmake would never create qt_webkit_version.pri. it worked under unix because configure collects all project files irrespective of the actual SUBDIRS structure. - a proper recursive qmake will cache the qt config, so the injection wouldn't be effective during the first qmake run so instead let the configures copy the pri file.
* fix loading of module configsOswald Buddenhagen2010-08-111-0/+0
| | | | | | | | | | | do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698
* Add support for -runtimegraphicssystem configure optionJason Barron2010-08-041-0/+0
| | | | | | | | | | | It has been requested that we provide a configuration option to specify the default "inner" graphics system that should be used when the runtime graphics system is in use. The argument specified to the option is written to the qconfig.h as QT_DEFAULT_RUNTIME_SYSTEM and this is used to instantiate the default graphics system that will be used by the runtime graphics system. Reviewed-by: Gunnar Sletta
* rebuild configure.exeJoerg Bornemann2010-07-211-0/+0
|
* Check in the correct configure.exeDaniel Molkentin2010-07-191-0/+0
| | | | Reviewed-By: Alessandro Portale
* Rebuilt configure.exeDaniel Molkentin2010-07-191-0/+0
|
* Rebuild configure.exe.Jason McDonald2010-07-171-0/+0
|
* rebuild configureOswald Buddenhagen2010-07-031-0/+0
|
* fix & unify path separator escapingOswald Buddenhagen2010-05-271-0/+0
| | | | Reviewed-by: mauricek
* Rebuild configure.exeAndrew den Exter2010-05-181-0/+0
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-181-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| * Fix build key on Windows with MinGW.Daniel Molkentin2010-05-051-0/+0
| | | | | | | | | | | | Also, rebuilt configure.exe Reviewed-by: Thiago Macieira
| * correct misleading note in configure on WindowsPeter Hartmann2010-05-051-0/+0
| | | | | | | | | | | | | | the option given in the note would not work if used as described. Reviewed-by: Zeno Albisser Task-number: QTBUG-2089
* | Rebuild configure following the removal of media services.Andrew den Exter2010-05-181-0/+0
|/
* Rebuild configure.exe with updated symbian media backend check.Andrew den Exter2010-04-291-0/+0
|
* New configure.exe binaryMarius Storm-Olsen2010-04-211-0/+0
|
* Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2dAndrew den Exter2010-04-161-0/+0
|
* configure.exe: Fix inverted logicMarius Storm-Olsen2010-03-111-0/+0
| | | | Reviewed-by: Rohan McGovern
* Make configure.exe fail for declarative if no script supportMarius Storm-Olsen2010-03-101-0/+0
| | | | | | | If the user tells configure not to compile QtScript, then fail if the user wants QtDeclarative or QtScriptTools Reviewed-by: Jørgen Lind
* Rebuild configure.exe (again enable QtDeclarative module by default)Kai Koehne2010-03-101-0/+0
| | | | Commit ad341d61 seems to have integrated a configure.exe from 4.6.
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-261-0/+0
| | | | | | | | | | Task-number: QTBUG-8562 Reviewed-by: ossi
* | Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-261-0/+0
|\ \ | | | | | | | | | | | | Conflicts: configure.exe
| * | Rebuild since -declarative auto detection changed.Martin Jones2010-02-261-0/+0
| | |
* | | fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-261-0/+0
|/ / | | | | | | | | Task-number: QTBUG-8562 Reviewed-by: ossi
* | Rebuild configure.exeAndrew den Exter2010-02-241-0/+0
|/
* Modified configure to detect SDK support for Symbian audio backendGareth Stockwell2010-02-181-0/+0
| | | | | | This version of configure.exe was compiled with MSVC 9.0. Reviewed-by: Miikka Heikkinen
* Fix handling of Evaluation licenses on the Windows configure.exeThiago Macieira2010-02-171-0/+0
| | | | Reviewed-By: Marius Storm-Olsen
* Further bug fixes for enable/disables DEF files mechanism on SymbianIain2010-02-041-0/+0
| | | | | | | | | | | | | | | | | | | | Fix bug where all target types, including apps, plugins and static libraries were getting DEFFILE statements - now it's just libraries that get it. Fix bug where duplicate DEFFILE blocks were being added to projects that manually specified their own DEFFILE - this now tests for the qmake variable "defBlock" being set, and doesn't add additional DEFFILE statements if it is. NOTE: This means that adding DEFFILE statements to MMP_RULES manually should be done by creating a variable called defBlock, and adding that to the MMP_RULES (ie. MMP_RULES += defBlock) Fix bug in configure.exe, where using -nokia-developer for Windows builds would warn about Symbian DEF file usage (or lack thereof) Reviewed-by: Janne Koskinen Reviewed-by: Jason Barron
* Revert "Update default FPU flags on Symbian to be softvfp+vfpv2"Iain2010-02-021-0/+0
| | | | | | | | | | | | RVCT2.2 build 686 crashes when compiling the drawhelpers with VFPv2 enabled. Until compiler workaround found, back out the change. This reverts commit 297e84fcfed524687455d3d94161bf2a32f62d37. Conflicts: configure.exe
* Remove warning about Symbian DEF files when running configure for WindowsIain2010-01-291-0/+0
| | | | | | | | Move SYMBIAN_DEFFILES definition in the dictionary into the Symbian specific section of configure Task-number: QTBUG-6556 Reviewed-by: Simon Hausmann
* Update default FPU flags on Symbian to be softvfp+vfpv2Iain2010-01-281-0/+0
| | | | Reviewed-by: Aleksandar Sasha Babic
* Updates to new Symbian DEF file systemIain2010-01-261-0/+0
| | | | | | | | | | | | | | | Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to see if DEF files were enabled, when setting the DEF file path Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was defined when testing for its value, due to incorrect use of QMap::operator[] Tidy up configure.exe help for new def files option Task-number: QTBUG-6556 Reviewed-by: Jason Barron Reviewed-by: Janne Koskinen
* Improve DEF file enable/disable mechanism on SymbianIain2010-01-221-0/+0
| | | | | | | | | | | | | | | | | | Provide configure flag to enable/disable the use of DEF files on Symbian. A useful side-effect was that it cleaned up how we control DEF files from qbase.pri and in WebKit. -nokia-developer still disables DEF files, as it triggers the autotest exports, which are not frozen into the DEF files. Disabling DEF files means that there is no BC with previously released versions of Qt, so this should only be used for development purposes. .pro files can specify custom locations for DEF files by setting defFilePath. Task-number: QTBUG-6556 Reviewed-by: Jason Barron
* Use MMP keyword, not compiler flags, to update FPU option on SymbianIain2010-01-131-0/+0
| | | | | | | | | | | This avoids two sets of --fpu flags being passed on the compiler command line, so we don't have to worry about which takes precedence (especially since it varies between RVCT and GCC). Putting ARMFPU in the MMP file means that the toolchain will replace its default option with the one we specify instead. Reviewed-by: Aleksandar Sasha Babic
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-12-141-0/+0
|\ | | | | | | | | Conflicts: configure.exe
| * Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-091-0/+0
| | | | | | | | | | | | Allow better control over audio backend used. Reviewed-by:Justin McPherson
* | fix accepting of old license keys (pre 4.6)Peter Hartmann2009-11-191-0/+0
| | | | | | | | Reviewed-by: Thiago Macieira
* | rebuilt configure.exePeter Hartmann2009-11-181-0/+0
| | | | | | | | | | | | | | | | there were several changes made to configure.exe recently, this commit makes sure we have rebuilt the binary after all the changes have been made. Reviewed-by: Thiago Macieira
* | configure.exe: fix when configured with -openssl-linkedPeter Hartmann2009-11-171-0/+0
|/ | | | | | | | | | | | | before, when configured with -openssl-linked, configure.exe hang, because of the following: We were checking for XQMAKESPEC via something like 'dictionary["XQMAKESPEC"] == "someValue"' , which added the XQMAKESPEC value to the dictionary. Later (line 3030), we checked whether XQMAKESPEC was set (which was now true), and we used the value although it was empty. Reviewed-by: Thiago Macieira Reviewed-by: Denis Dzyubenko
* Make declarative support in configure.exe auto.Martin Jones2009-11-051-0/+0
| | | | Reviewed-by: Warwick Allison
* eval: add key for the installer to grep for.Daniel Molkentin2009-11-041-0/+0
| | | | Reviewed-By: con
* Prepend qt_instdate when using configure.exe as well. Rebuilt configure.exeDaniel Molkentin2009-11-031-0/+0
| | | | | | Rebuilt using VS2008. Reviewed-By: Alessandro Portale
* Enable webkit and xmlpatterns by default on Symbian.Frans Englich2009-10-271-0/+0
| | | | Suggested by Lars, OK'd by Jason, Kristian and Shane.
* Rebuilt configure.exe.Miikka Heikkinen2009-10-141-0/+0
| | | | Reviewed-by: Janne Koskinen
* With an embedded linux licence you should also be able to use the Qt Windows ↵Alexis Menard2009-10-071-0/+0
| | | | | | | | | version for development. This used to work before 4.5.1 Task-number:Qt-704 Reviewed-by:thiago
* Rebuild configure.exeKent Hansen2009-09-291-0/+0
| | | | Bring it up-to-date with commit 950f80620b56e9ed277240dc16087f3e4b53cc4a.
* Update recommendation for make command to run after configure for SymbianIain2009-09-211-0/+0
| | | | | | | | | | | The makefile written for calling the Symbian build tools is for GNU make not nmake, so print an accurate message when -xplatform is symbian-<whatever> We still don't make the correct recommendation for the confclean target but that doesn't work anyway (see QTBUG-4536) Reviewed-by: Jason Barron
generated by cgit v0.12 at 2024-12-29 04:55:36 (GMT)