summaryrefslogtreecommitdiffstats
path: root/tools/configure
Commit message (Collapse)AuthorAgeFilesLines
* fix loading of module configsOswald Buddenhagen2010-08-111-2/+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
* configure.exe: don't write the QT_NAMESPACE define to .qmake.cacheJoerg Bornemann2010-08-111-1/+0
| | | | | | | | | Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the QT_NAMESPACE=MyNamespace define for us. Task-number: QTBUG-5221 Reviewed-by: ossi
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-042-0/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the remote command delimiter, this has cahnged at some point. Assistant: Revert previous commit, issue was already fixed. fix line endings fix compilation with -plugin-kbd-* Fix typo in docs Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS Fix compilation with QT_NO_DBUS fix inaccurate comment
| * Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBSMark Brand2010-08-042-0/+17
| | | | | | | | | | | | | | | | | | | | Consistent with QT_LFLAGS_* for other database drivers. Support added to configure shell script and configure.exe. Respect SYBASE and SYBASE_LIBS. Use QT_LFLAGS_TDS in project files. Merge-request: 2416 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Add support for -runtimegraphicssystem configure optionJason Barron2010-08-041-4/+12
|/ | | | | | | | | | | 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
* Make it possible for Qt modules to extend QT_CONFIGSimon Hausmann2010-07-231-0/+2
| | | | | | | | This is done by reading the module files from within qconfig.pri. Task-number: QTBUG-12379 Rubber-stamped-by: Joerg Bornemann Rubber-stamped-by: Marius Storm-Olsen
* make "configure -qt-gif" work again on WindowsJoerg Bornemann2010-07-211-2/+2
| | | | | | The value for GIF must be "plugin" and not "yes". Reviewed-by: danimo
* Make configure.exe accept -no-gif again, fix commentDaniel Molkentin2010-07-191-1/+3
| | | | Reviewed-By: Jason McDonald
* fix qconfig.h aliased header creationOswald Buddenhagen2010-07-141-10/+0
| | | | | | | | don't have configure create the forwarding headers (or symlinks on unix) for qconfig.h, but instead have syncqt create forwarding headers for not yet existing files. Reviewed-by: joerg
* fixed built-in jpeg and tiff in configure.exe, QTBUG-12093Mark Brand2010-07-121-0/+4
| | | | | Merge-request: 740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix indentationMark Brand2010-07-121-1/+1
| | | | | Merge-request: 740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-07-031-1/+2
|
* Fix Windows buildMark Brand2010-07-031-4/+4
| | | | | | | | Set the QT_NO_IMAGEFORMAT_* defines like the unix configure does. This avoids that we try to link the image handlers into QtGui when they are built as plugins. Reviewed-by: ossi
* Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-021-42/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, although the configure shell script could configure built-in support for these image formats, the .pr[io] files would nevertheless build them as plugins. Support was also missing from qimagereader and qimagewriter. This has now been added. Configure.exe, while clearly intended to support this too, needed a few minor fixes. For example, the usage of values "qt" and "yes" was inconsistent. For both configure tools, the explanation of the *non*-related options has been clarified, i.e: -no-libjpeg -qt-libjpeg -system-libjpeg These options have nothing to do with the plugin/built-in distinction. There are (still) no configure options for specifying "plugin" or "built-in" for these image formats. Quite reasonably, "plugin" is selected for shared Qt and "built-in" is selected for static Qt. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Split image handler plugin project filesMark Brand2010-07-021-1/+1
| | | | | | | | | | | | | | | One pri for each handler, e.g. src/gui/image/qjpeghandler.pri. One pri for each 3rd party package, e.g src/3rdparty/libjpeg.pri. One shared pri for zlib dependency of 3rd party packages. This was really about image handler plugins, but PNG got the same treatment for consistency's sake. Also, moved image handler source files from plugins to src/gui/image so they are with the other image handlers. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Reformat whitespace according to coding styleMark Brand2010-06-301-596/+596
| | | | | | | | Mostly indentation affected, but also standardized spaces adjacent to () in configureapp.cpp. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removed support for static linking of QtWebKit.Simon Hausmann2010-06-231-0/+5
| | | | | | | | Static linking of WebKit is not going to be supported anymore in Qt 4.7, so this commit makes sure it's mentioned in the documentation and that configure disables WebKit if static linking of Qt is requested. Reviewed-by: Andy Shaw <qt-info@nokia.com>
* make postgresql support sensitive to PSQL_LIBSMark Brand2010-06-102-0/+5
| | | | | | | | | The PSQL_LIBS environment variable is a standard way to pass the required library list. The changes here add support for this to the configures. Merge-request: 673 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-1/+1
| | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-281-8/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add missign license headers. Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian. Make link on linux/symbian Fix double slashes on few data caging paths Fix for QRuntimePixmapData serial number setting. Enable QTouchEvent for S60 5.0 Add missing license header. Fix build error on S60 3.1 environments QRuntimeGraphicsSystem Fix replacement functions in platform_paths.prf
| * Merge branch '4.7' of scm.dev.troll.no:qt/qt-s60-public into 4.7Jani Hautakangas2010-05-201-31/+31
| |\
| * | QRuntimeGraphicsSystemJani Hautakangas2010-05-201-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRuntimeGraphicsSystem is a proxy graphics system which can dynamically switch underlying graphics system on runtime. For example, switch from hardware accelerated graphics system to raster graphics system on low GPU memory situation. This feature is currently supported on Symbian platform. Task-number: QT-3276 Reviewed-by: Jason Barron
* | | fix & unify path separator escapingOswald Buddenhagen2010-05-272-49/+58
| |/ |/| | | | | Reviewed-by: mauricek
* | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-191-28/+1
|\ \ | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-181-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Removed mediaservices.Kurt Korbatits2010-05-181-28/+1
| | |/ | |/|
* | | Shadow building on Symbian fixes: part 2 - populate bin dir correctlyIain2010-05-141-1/+28
| |/ |/| | | | | | | | | | | | | | | Second in a set of fixes for shadow building on Symbian - create links in the shadow bin dir to the Symbian specific scripts we've added to the bin directory Task-number: QTBUG-10432 Reviewed-by: Alessandro Portale
* | Fix build key on Windows with MinGW.Daniel Molkentin2010-05-051-1/+1
| | | | | | | | | | | | Also, rebuilt configure.exe Reviewed-by: Thiago Macieira
* | correct misleading note in configure on WindowsPeter Hartmann2010-05-051-1/+1
|/ | | | | | | the option given in the note would not work if used as described. Reviewed-by: Zeno Albisser Task-number: QTBUG-2089
* Don't disable the symbian media backend.Andrew den Exter2010-04-291-16/+20
| | | | | | | The absence of the DirectX or Windows SDK is of no relevance to the symbian media backend. Reviewed-by: Derick Hawcroft
* Add support for MSBuild, which is the project format for MSVC 2010Martin Petersson2010-04-213-3/+9
| | | | Reviewed-by: Marius SO
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-191-15/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| * QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-5/+5
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-15/+27
| |
* | don't add -unix to the qmake command lineOswald Buddenhagen2010-04-161-1/+0
|/ | | | | | it is redundant now and causes warnings from qmake Reviewed-by: mariusSO
* 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
generated by cgit v0.12 at 2024-08-25 13:41:15 (GMT)