summaryrefslogtreecommitdiffstats
path: root/tools/configure
Commit message (Collapse)AuthorAgeFilesLines
* Change to release licenses for 4.6.3.Jason McDonald2010-05-308-104/+104
| | | | Reviewed-by: Trust Me
* re-add overriding of tool paths to configureOswald Buddenhagen2010-05-171-0/+5
| | | | | | | | unlike originally planned, we didn't remove the setting of the tool paths from the qmake specs - for compat reasons. however, that means that they will make the QT_BUILD_TREE handling in qtPrepareTool ineffective, which meant that the qt build would try to use the tools from an installed qt ...
* define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-141-5/+0
| | | | | | | | | | | | | | | the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-0/+6
| | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* Implemented QLibraryInfo::TranslationsPath for Symbian.Janne Anttila2010-03-091-0/+1
| | | | | | | | Discussed with QtProd and they agreed "/resource/qt/translations" would be suitable path to return from QLibraryInfo::TranslationsPath. Task-number: QTBUG-8291 Reviewed-by: Miikka Heikkinen
* fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-261-1/+1
| | | | | Task-number: QTBUG-8562 Reviewed-by: ossi
* Modified configure to detect SDK support for Symbian audio backendGareth Stockwell2010-02-181-1/+49
| | | | | | This version of configure.exe was compiled with MSVC 9.0. Reviewed-by: Miikka Heikkinen
* Added implementation of epocRoot() function to configureGareth Stockwell2010-02-183-2/+17
| | | | | | | | Exposing epocRoot() to the configure application allows it to determine the location of the currently active Symbian SDK, so that support for optional SDK features can be checked. Reviewed-by: Miikka Heikkinen
* Removed duplicated implementation of readRegistryKeys from configureGareth Stockwell2010-02-183-125/+6
| | | | | | | Configure now shares - at the source level - a single implementation of this function with qmake. Reviewed-by: Miikka Heikkinen
* Fix handling of Evaluation licenses on the Windows configure.exeThiago Macieira2010-02-171-1/+2
| | | | Reviewed-By: Marius Storm-Olsen
* Fix QT_BUILD_KEY for Symbian.Miikka Heikkinen2010-02-161-10/+17
| | | | | | | | Symbian builds didn't set build key properly, so it defaulted to a Windows key. This caused problems with loading plugins. Task-number: QTBUG-7942 Reviewed-by: axis
* Further bug fixes for enable/disables DEF files mechanism on SymbianIain2010-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | 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
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-011-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Documented limitations of add/setLibraryPath(s) on Symbian OS Deployed QtMultimedia.dll on Symbian Fixed the URL of known issues wiki page in docs Fixing benchmark to be runnable on Symbian device Fixing test to be runnable on Symbian devices. Fixed no-timeout case for QProcess::waitForFinished in Symbian Add visibility-inlines-hidden for GCCE on Symbian OS Catch by reference rather than by value Fixing benchmark for Symbian Remove warning about Symbian DEF files when running configure for Windows List item margins are too small due to invalid pixel metric value Remove left over forward declarations Avoided the loss of preedit text when losing focus on Symbian. Added support for ifdeffing for manufacturer in generated pkg files Shortening and fixing previous fix for QTBUG-6371 Update default FPU flags on Symbian to be softvfp+vfpv2 Using RunFast mode for RVCT
| * Remove warning about Symbian DEF files when running configure for WindowsIain2010-01-291-1/+1
| | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | Reviewed-by: Aleksandar Sasha Babic
* | audiodevices example: no devices availableKurt Korbatits2010-02-011-1/+4
|/ | | | | | | audio-backend option was not being written out to qconfig.pri Task-number:QTBUG-7782 Reviewed-by:Justin McPherson
* Updates to new Symbian DEF file systemIain2010-01-261-7/+9
| | | | | | | | | | | | | | | 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-2/+24
| | | | | | | | | | | | | | | | | | 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
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-01-138-8/+8
|\
| * Update copyright year to 2010Jason McDonald2010-01-068-8/+8
| | | | | | | | Reviewed-by: Trust Me
* | Use MMP keyword, not compiler flags, to update FPU option on SymbianIain2010-01-131-1/+2
|/ | | | | | | | | | | 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-2/+9
|\ | | | | | | | | Conflicts: configure.exe
| * Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-091-2/+9
| | | | | | | | | | | | Allow better control over audio backend used. Reviewed-by:Justin McPherson
* | fix accepting of old license keys (pre 4.6)Peter Hartmann2009-11-191-2/+5
| | | | | | | | Reviewed-by: Thiago Macieira
* | Fixed a few license checks in configure.exe.axis2009-11-181-13/+5
| | | | | | | | | | | | Needs recompile. Reviewed-By: Thiago Macieira
* | configure.exe: Update to the new licensing structure.Thiago Macieira2009-11-181-26/+66
| | | | | | | | | | | | | | | | Add support for Symbian commercial licenses and adapt to the possibility from the RT operating systems Task-number: QT-2518 Reviewed-by: axis
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-181-1/+2
|\ \ | | | | | | | | | | | | Conflicts: configure.exe
| * \ Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-101-4/+12
| |\ \ | | |/ | | | | | | | | | Conflicts: tools/configure/configureapp.cpp
| * | build lrelease bootstrappedOswald Buddenhagen2009-11-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | configure.exe: fix when configured with -openssl-linkedPeter Hartmann2009-11-171-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-091-0/+11
|\ \
| * | Added a -no-native-gestures option for configure.exeDenis Dzyubenko2009-11-061-0/+11
| |/ | | | | | | | | | | | | | | The option allows to disable native Windows7 gestures since they require the creation of the native window handle. This partially disabled alien widgets concept and make window resizing slower and more flickery. Reviewed-by: Espen Riskedal
* | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-091-4/+1
|\ \ | |/ |/| | | | | | | | | Conflicts: configure.exe src/corelib/io/qfsfileengine.cpp tests/auto/qfile/tst_qfile.cpp
| * Add src/tools/tools.pro, and use when building host tools for xcompilingMarius Storm-Olsen2009-11-041-4/+1
| | | | | | | | | | | | | | | | | | Configure.exe would simply initiate a build for each of the tools in order. However, this would break certain distributed build systems, since they would return right away after initiating the make. Thus, sometimes moc et al. would try to link before bootstrap lib was built. Reviewed-by: Jason McDonald
* | Make declarative support in configure.exe auto.Martin Jones2009-11-051-1/+5
| | | | | | | | Reviewed-by: Warwick Allison
* | eval: add key for the installer to grep for.Daniel Molkentin2009-11-041-1/+1
| | | | | | | | Reviewed-By: con
* | Declarative building infrastructure.Warwick Allison2009-11-041-0/+12
| | | | | | | | Does nothing if no declarative directories installed.
* | Prepend qt_instdate when using configure.exe as well. Rebuilt configure.exeDaniel Molkentin2009-11-031-1/+1
| | | | | | | | | | | | Rebuilt using VS2008. Reviewed-By: Alessandro Portale
* | disable link time code generation by default on Windows CEJoerg Bornemann2009-11-031-1/+0
| | | | | | | | | | | | | | To be consistent with desktop Windows Qt, we also disable LTCG by default. To turn it on, use the -ltcg configure switch. Reviewed-by: mauricek
* | Compilation failure QtOpenGL when Opengl ES is used on Qt for Windows CEKeith Isdale2009-11-021-0/+3
| | | | | | | | | | | | | | | | Enable building egl/qegl_wince.cpp when a wince* mkspec is used Add "egl" to QT_CONFIG when any of the OpenGL ES variants is used Task-number: QTBUG-5073 Reviewed-by: Trond Kjernåsen
* | Merge branch '4.6-s60' into 4.6axis2009-10-301-15/+9
|\ \ | |/ |/|
| * Removed mentions about certain flags being temporary for SymbianMiikka Heikkinen2009-10-291-13/+7
| | | | | | | | | | | | | | | | | | | | In configure app, some QT_NO_* flags were indicated to be temporary and should be removed once Qt for Symbian is out, but it looks like at least some of them will be there for longer haul, so removed mentions of temporary nature of these flags. Task-number: QTBUG-4744 Reviewed-by: Janne Anttila
| * Enable webkit and xmlpatterns by default on Symbian.Frans Englich2009-10-271-2/+2
| | | | | | | | Suggested by Lars, OK'd by Jason, Kristian and Shane.
* | Also change the configure.exe to ensure that the necessary new configsThiago Macieira2009-10-291-1/+23
|/ | | | | | are generated Reviewed-By: Daniel Molkentin
* Synced QT_BUILD_PARTS in .qmake.cache and projects.pro for Symbian.Miikka Heikkinen2009-10-141-0/+3
| | | | | | | | | | Projects.pro is forcing QT_BUILD_PARTS to omit docs and translations, but configure still outputted those into .qmake.cache. Fixed configure to also omit them for Symbian builds to make building demos work equally whether built by from root or not. Task-number: QT-1018 Reviewed-by: axis
* Changed "Qt for S60" -> "Qt for Symbian" in configure.Miikka Heikkinen2009-10-141-1/+1
| | | | Reviewed-by: axis
* With an embedded linux licence you should also be able to use the Qt Windows ↵Alexis Menard2009-10-071-1/+1
| | | | | | | | | version for development. This used to work before 4.5.1 Task-number:Qt-704 Reviewed-by:thiago
* Enable QtScript by default on WindowsKent Hansen2009-09-291-2/+2
| | | | Reviewed-by: Simon Hausmann
* Update recommendation for make command to run after configure for SymbianIain2009-09-211-1/+1
| | | | | | | | | | | 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-11-18 17:01:35 (GMT)