summaryrefslogtreecommitdiffstats
path: root/configure.exe
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Remove remaining support for win32-mwc mkspecIain2009-09-181-0/+0
| | | | | | | | | | | | | | | | Qt 4.6 cannot be used with the win32-mwc makespec, as the Metrowerks compiler supplied with Symbian/S60 releases does not contain enough support to build the Qt host tools in a Unicode version, and ANSI support has been removed in 4.6. Alternative mkspecs are win32-g++, requiring mingw tools to be installed, or one of the win32-msvc.... mkspecs, requiring MS Visual Studio (Express edition is fine) The mwc makefile for qmake was already removed, so this just removes the remaining support. Reviewed-by: Jason Barron
* QCursor support for Symbian OSShane Kearns2009-09-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Jason Barron Reviewed-By: Alessandro Portale Summary: QT_NO_CURSOR is now not defined for symbian builds Existing QCursor APIs are all supported New public API, QApplication::setNavigationMode, to allow the navigation mode to be set. I.E. on an S60 3.2 phone, some applications will want a virtual mouse cursor (web browser), while others are designed for keypad navigation. Symbian HAL is used for detecting input capabilities. Fix DND, code cleanup & comment QCursor visibility now uses a refcount, and is called from DND and the setNavigationMode so they are both simpler and don't interfere with each other. QApplication::setNavigationMode New public API for configuring cursor/keypad navi style. This links in with ongoing work on the 4-way keypad navi branch, but 2-way and 4-way modes both act as 2-way mode until that is integrated Some of the demos/examples have cursor switched on (those that were not usable with keypad) Virtual mouse support for non touch, non mouse phones (tested on N78) add *.d and .metadata (carbide debug file / workspace dir) to .gitignore System pointers are unavailable when using sprite workaround, so the system cursor shapes are compiled into qtgui as resources. MAC port does this also for shapes that aren't standard on the MAC. Refactor Drag'n'Drop to use QCursor Add test case to check all system cursor shapes Simply a mainwindow containing a label widget for each cursor shape, with the cursor property set appropriately QCursor(QBitmap,QBitmap) supported Fixed problem with the image & mask being inverted when using the QCursor constructor that takes two mono bitmaps. add .make.cache files to .gitignore Correct implementation of QApplication::setOverrideCursor QApplication::restoreOverrideCursor and QApplication::setOverrideCursor are now working correctly on Symbian platform. Performance will be slower compared with other platforms, because the Symbian window server has a cursor associated with each native window. Add test case for custom cursors Create a pixmap cursor and associate it with a widget. No changes to production code, since test passed 1st time ;) Add manual test for QCursor Make cursor independent of construction order Updated to work around window server issue where contruction order affects what cursor is displayed in child windows. Also changed to effectiveWinId following review comments Also fixed a problem which would make qcursor not link if configured with QT_NO_CURSOR Moved some multiply declared extern functions from cpp to _p.h files Implemented Symbian versions of the cursor functions. Merged in work I'd done based on tower. Fill in bits of stub functions based on windows port Removed QT_NO_CURSOR from list of config options forced on symbian Recompiled configure.exe Added stub functions for the missing functions in s60 port
* Rebuild configure.exe.Jason Barron2009-08-211-0/+0
| | | | This binary was built with MSVC2008 and the /MT option.
* Recompiled configure.exeJanne Anttila2009-08-121-0/+0
|
* Merge commit 'qt/master-stable'Jason Barron2009-07-281-0/+0
|\ | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * Built configure.exe.Friedemann Kleint2009-07-241-0/+0
| |
| * New BinaryFriedemann Kleint2009-07-211-0/+0
| |
| * configure -dont-process must build the host tools on Windows CEJoerg Bornemann2009-07-211-0/+0
| | | | | | | | Reviewed-by: mauricek
| * Rebuilt the configure.exeThierry Bastian2009-07-151-0/+0
| |
| * New configure.exe.Rohan McGovern2009-07-091-0/+0
| | | | | | | | | | | | | | | | | | Includes: 9b532a999944c70c2e8f57d9156c1887867ad9f1 - qtlibinfix bb8e25a5074a378d5003577fefbeabb1de846a81 - cetest fix 5ea86cfac34f65b2321ceeeb651e4e7099bf59a0 - QT_WA removal 349997b5c4167b07d0bdc55beff175b39f3abe75 - spelling fix bae8bc5d23946036b2c1079fc6f1b3bceeaa19ca - QT_CONFIG+=private_tests
| * New binaryMarius Storm-Olsen2009-06-291-0/+0
| |
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-161-0/+0
| |\
| | * New binary for configure.exeMarius Storm-Olsen2009-06-151-0/+0
| | | | | | | | | | | | Reviewed-by: trustme
| * | New binaryMarius Storm-Olsen2009-06-081-0/+0
| |/ | | | | | | | | Fixes the no qconfig.h output issue in main Reviewed by: trustme
| * New configure.exe binaryMarius Storm-Olsen2009-05-291-0/+0
| | | | | | | | | | | | Task-number: 254451 Reviewed-by: trustme BT: yes
| * Turn off Link Time Code Generation (/LTCG) by defaultMarius Storm-Olsen2009-05-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Turning on LTCG affected too many projects, where customers applications would take a long time linking, severly affecting their development time (even though it was only added for release builds) We turn it off by default, and add a -ltcg configuration option, and the possibility to also do CONFIG+=ltcg in projects, should they not want it for Qt, but in their own projects. (Same, they can build Qt with it, and do CONFIG-=ltcg for their project) Reviewed-by: andy
* | Recompiled configure.exe with MSVC6.axis2009-07-151-0/+0
| |
* | Make S60 integration optional.Jason Barron2009-07-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than anything else. One of the side effects of this work was that it was relatively little work to get QtGui compiling when Q_WS_S60 is not defined. Based on this we introduce two new configure options that control S60 integration. Currently the -no-s60 option will not work entirely because the 's60main' module has not yet been refactored and still has a dependancy on the S60 libraries. Reviewed-by: axis <qt-info@nokia.com>
* | Recompiled configure.exe with MSVC6.axis2009-07-091-0/+0
| |