summaryrefslogtreecommitdiffstats
path: root/tools/configure
Commit message (Collapse)AuthorAgeFilesLines
* Make configure.exe compatible with mingw 64Thierry Bastian2010-04-081-1/+1
|
* Define QT_NO_EGL in configure.exeTom Cooksey2010-03-261-0/+4
| | | | | | | | This is the "proper" fix for the windows build failure introduced by 75bb84ac. a44026a3 should be reverted once configure.exe is rebuilt to incorperate this fix. Reviewed-By: Marius Storm-Olsen
* compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-232-13/+18
|
* Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-151-15/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. ...
| * | configure.exe: Fix inverted logicMarius Storm-Olsen2010-03-111-1/+1
| | | | | | | | | | | | Reviewed-by: Rohan McGovern
| * | Make configure.exe fail for declarative if no script supportMarius Storm-Olsen2010-03-101-15/+27
| | | | | | | | | | | | | | | | | | | | | If the user tells configure not to compile QtScript, then fail if the user wants QtDeclarative or QtScriptTools Reviewed-by: Jørgen Lind
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-0/+1
|\ \ \ | |/ / |/| / | |/ | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * 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
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-271-1/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| * \ Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-261-1/+10
| |\ \ | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | * | Test for the existance of the Windows Media SDK in configure.Andrew den Exter2010-02-251-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some filters use interfaces from the windows media sdk instead of those from direct show. These interfaces aren't required for playback, but can provide better feedback about the current media than would otherwise be available. Reviewed-by: Justin McPherson
* | | | Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-261-2/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: configure.exe
| * | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-242-1/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/qml/qml.pri src/multimedia/qml/qmlaudio_p.h src/multimedia/qml/qmlgraphicsvideo_p.h src/multimedia/qml/qmlmediabase_p.h src/plugins/qmlmodules/multimedia/multimedia.cpp
| * | | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-241-1/+15
| | | |
| * | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-1/+1
| | | | | | | | | | | | | | | | QDeclarativeXXX.
* | | | fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-261-1/+1
| |/ / |/| | | | | | | | | | | Task-number: QTBUG-8562 Reviewed-by: ossi
* | | Add -mediaservice argument to configure.Andrew den Exter2010-02-242-1/+13
|/ / | | | | | | | | | | | | | | Enables building the default media service backend for a platform. Is on by default if the build environment requirements are met and -no-mediaservice disables the option. Reviewed-by: Justin McPherson
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-201-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * | Mobility 404Wolfgang Beck2010-02-161-0/+4
| | |
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-204-128/+72
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| * | 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
* | | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h
| * | Fix handling of Evaluation licenses on the Windows configure.exeThiago Macieira2010-02-171-1/+2
| | | | | | | | | | | | Reviewed-By: Marius Storm-Olsen
* | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-10/+17
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * 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
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-1/+3
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * 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
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * 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
* | | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-14/+0
| | | | | | | | | | | | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-4/+31
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | 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'Thiago Macieira2010-01-181-1/+2
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-01-138-8/+8
| |\
| * | 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'Thiago Macieira2010-01-138-8/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | Update copyright year to 2010Jason McDonald2010-01-068-8/+8
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-2/+9
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * 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
generated by cgit v0.12 at 2024-11-14 13:01:58 (GMT)