summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Fix configure -help output. declarative module is built by default.Martin Jones2010-08-181-2/+2
| | | | | Task-number: QTBUG-12840 (cherry picked from commit d904fe2273be5d39b54b987eef6b9cc0d1b85c4b)
* Revert "fix compilation with -plugin-kbd-*"Toby Tomkins2010-08-081-1/+1
| | | | This reverts commit 815ae300c9feb1930a338e8ab49589b14c57d0de.
* fix compilation with -plugin-kbd-*Oswald Buddenhagen2010-08-081-1/+1
| | | | | | | | it certainly is not such a good idea to write mouse when one means kbd ... Task-number: QTBUG-12483 (cherry picked from commit 9f6bcd7ff39462ec2028ddbe27fc04911b856018)
* configure: don't symlink the mkspecs/features directoryJoerg Bornemann2010-08-041-0/+8
| | | | | | | | | | | | | | In shadow builds, the directory QT_BUILD_TREE/mkspecs/features isn't a mere symlink anymore. The directories below mkspecs/features are copied and every single file is symlinked. This makes it possible to place .prf files into a shadow build's mkspecs/features directory, like Qt Mobility does with its mobility.prf, without polluting the source directory. Task-number: QTBUG-12545 Reviewed-by: ossi (cherry picked from commit aff888a3e7f3d9ee2c5611c2dd5c0ff1693752c6)
* Fixed plugin build key for Symbian builds under Linux.axis2010-07-281-1/+11
| | | | | | Task: QTBUG-8962 RevBy: Jason Barron (cherry picked from commit 71df0ad5c02365e3baf8f6996d4b258f5da52a2f)
* Made developer builds use the build dir as prefix, also on Symbian.axis2010-07-221-14/+10
| | | | | | | | | Otherwise it is not possible to build projects outside of the Qt tree without installing Qt to the SDK first. Task: QTBUG-11727 RevBy: Trust me (cherry picked from commit 11d626de5fd87fc8cbd9d685bde8217c7ad7fae6)
* Removed the need to specify -arch symbian when compiling on Linux.axis2010-07-221-0/+2
| | | | | | Task: QTBUG-11385 RevBy: Jason Barron (cherry picked from commit d9e75d77ac3da86c32d280895beac2936d8869ca)
* Make configure.exe accept -no-gif again, fix commentDaniel Molkentin2010-07-201-1/+1
| | | | | Reviewed-By: Jason McDonald (cherry picked from commit a545e26e1183133f4a66cb9a3bcd9051e2d77894)
* Revert "Revert "fix qconfig.h aliased header creation""Jason McDonald2010-07-171-5/+0
| | | | | This reverts commit 7702be3de6e2641afb1062f533567ca7a72e8e0f as a potential fix is now available.
* Revert "fix qconfig.h aliased header creation"Jason McDonald2010-07-171-0/+5
| | | | | This reverts commit 74564a9b9f0f4e4ead8c3e38f72c24054b65f62a, which breaks configure for Windows CE builds.
* fix qconfig.h aliased header creationOswald Buddenhagen2010-07-161-5/+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 (cherry picked from commit 74d0482c1690211a20bdfc996aa0ad30fdb9bb28)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-031-9/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Consolidate zlib configuration redundancy Fixed whitespace formatting Fix incomplete support for built-in jpeg, mng, tiff and gif handlers Split image handler plugin project files No explicit link to zlib/jpeg for system mng/tiff Removed stray line continuations Long live else! qdoc: Added a solution for creating tables of contents for manuals. Doc: Fixed markup. Fixed size hint for combo box on windows
| * Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-0/+7
|/ | | | | Task: QTBUG-11396 RevBy: Miikka Heikkinen
* Use built-in iconv on Solaris if availablePierre Rossi2010-06-301-0/+3
| | | | | Task-number: QTBUG-1853 Reviewed-by: Thiago
* Make symbian/unix shadow builds work again.Thomas Zander2010-06-251-1/+1
|
* Removed support for static linking of QtWebKit.Simon Hausmann2010-06-231-0/+6
| | | | | | | | 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-101-0/+2
| | | | | | | | | 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>
* support for cross building Qt for MinGW (win32-g++) on UnixMark Brand2010-06-101-12/+58
| | | | | | | | | | | | | This changeset provides the basis for targetting win32-g++ on Unix using the configure shell script: support added to the configure script itself support added to relevant config.tests support added to mingw makefile generator in qmake new makespec: unsupported/win32-g++-cross The makespec is based on the win32-g++ makespec. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* minor cosmetic improvementsMark Brand2010-06-091-2/+2
| | | | | | | Made whitespace and case more consistent. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-081-8/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) I10n: Update German translations for 4.7.0 Fix a freetype link failure. Fix configure test for DirectFB Split Symbian bearer plugin into three platform specfic plugins Doc: Fixed whitespace in the other configuration file for zh_CN. Doc: Fixed whitespace in the Simplified Chinese doc configuration. Unbreak Linux build when qendian.h is included before qglobal.h Revert accidental commit of irrelevant stuff. Silly mondays.. Unbreak Linux build when qendian.h is included before qglobal.h Fix QApplication/QWidget to really take ownership of input contexts Added setting a hotspot on standard gestures Fixed GestureOverride event delivery in GraphicsView. add check-ts target to auto-asses translation completeness qt_ja_JP.ts => qt_ja.ts Fix incorrect \since tag XQuery test suite (and others): remove p4 dependency add docu about pixmaps being invalidated on qapp destruction remove somewhat misleading warning about x11 pixmap leak Disabled item view items use incorrect background color Update the mkspec for linux-icc: don't use jump tables in shlibs ...
| * Fix configure test for DirectFBAnders Bakken2010-06-081-8/+6
| | | | | | | | | | | | | | The availability of directfb-config does not depend on pkg-config Merge-request: 2409 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-081-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/painting/qpainter.cpp src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qfontmetrics/tst_qfontmetrics.cpp tools/linguist/lupdate/main.cpp
| * fix misleading hintOswald Buddenhagen2010-06-031-1/+1
| | | | | | | | | | | | it is "FOO=bar ./configure", not "./configure FOO=bar". Task-number: QTBUG-11058
| * 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
* | Make symbian install to epocroot by default.Thomas Zander2010-06-071-8/+18
| | | | | | | | | | | | | | | | | | On symbian cross-compiling is the only way so the libraries and headers are all stored in symbian-specific ways which is called EPOCROOT. This change makes a configure without -prefix being passed in populate the EPOCROOT on 'make install'. When the user passes a prefix it will just do what a normal unix build does on make install.
* | Search local directory if no qconfig file found in src/corelib/global/Tasuku Suzuki2010-06-041-2/+8
| | | | | | | | | | | | | | | | | | | | configure script searched qconfig-local.h under src/corelib/global/ with "-qconfig local". After this commit, configure tries to find local directory if the file is not found in the path. Now you can pass the option like "-qconfig ./qconfig-myconfig.h" Merge-request: 2341 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Fix compilation: disable -no-feature-* for bootstrappedTasuku Suzuki2010-06-031-0/+8
| | | | | | | | | | | | | | moc isn't compiled when qt is configured if -no-feature-datestring Merge-request: 2347 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Fix architecture detection on GNU/Hurd.Pino Toscano2010-05-251-0/+11
| | | | | | | | | | | | | | | | | | On GNU/Hurd, `uname -m` returns a string like "i686-AT386", which is not recognized. Instead, do a specific mangling on "GNU" host, the same done by autotools' config.guess, so the architecture can be identified and the proper atomic primitives used. Merge-request: 638 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Added default countries for Mongolian and Nepali. Updated tst_qlocale autotest. Updated the 4.7.0 change log with my changes. Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 ) doc: Fixed many broken links. doc: Fixed many broken links. doc: Fixed many broken links. qdoc: Set back to 3 cols for class list; we have a scrollbar now. Fix build on Mac OS X and Windows. Remove obsolete and broken qvfb skins. Only setup ICD test data when ICD is enabled. Doc: Fixed two diagrams and finally committed images for them. Make sure cursorPositionChanged is emitted when doing undo/redo Some more 4.7.0 changes Fix cosmetic issue in designer filter edits Doc: Adding support for IE 6, 7 and 8 doc: Updated the widgets tutorial to work without page links. My 4.7.0 changes Added support for es_419 locale. Added Korean and Nynorsk locales support on Symbian. ...
| * \ Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-191-49/+3
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale_symbian.cpp
| * | | Fix build on Mac OS X and Windows.Aaron McCarthy2010-05-191-1/+1
| | | |
* | | | Freetype is not used on symbian, don't use it.Thomas Zander2010-05-191-0/+1
| | | |
* | | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-191-49/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | 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-8/+43
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-49/+3
| | | |
* | | | Disable compiling unsupported classes for SymbianThomas Zander2010-05-191-2/+11
| |/ / |/| | | | | | | | | | | | | | | | | The accessibility classes are currently unsupported on Symbian, so don't compile them in. The various styles will not be pretty on symbian either, so don't compile them in.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-121-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (158 commits) qdoc: Yet another revision of the top doc page. Doc: Update on web template Added QDateTime::msecsTo() Doc: Fixed tables and images for the new docs qdoc: Yet another revision of the top doc page. Revert "Improve QUrl handling of local file paths" Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively" Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to" Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs." qdoc: Another revision of the top doc page. Doc correction to css Doc: Updates to the html template and javascript tst_SuiteTest: Fix a meaningless switch statement My 4.7.0 changelog entries. qdoc: Fixed annotated list generation to use <td>, not <th>. Doc: Tuning search script qdoc: Reorganized examples panel. Doc: Chages to search feature, css and table order QtDeclarative: avoid waiting for a network load on URIs with empty schemes. QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively ...
| * | | Fix syntax error in configure scriptBernhard Rosenkraenzer2010-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ./configure: line 5883: [: missing `]' ./configure: line 5883: no: command not found It's either if [ "$CFG_OPENGL" = "es1" -o "$CFG_OPENGL" = "es2" ]; then or if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es2" ]; then but not if [ "$CFG_OPENGL" = "es1" || "$CFG_OPENGL" = "es2" ]; then Merge-request: 616 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Unix configure: fix sed pattern extracting C and C++ flags from mkspecThiago Macieira2010-05-031-2/+2
| |/ / | | | | | | | | | Reviewed-By: ossi
* | | Add configure time checks for symbian environmentThomas Zander2010-05-071-3/+38
| | | | | | | | | | | | | | | | | | | | | Adding test for various compile time components like rcomp and the compiler actually working should make it failing much more transparant. Reviewed-by: Thiago
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-031-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| * | Enabled previously disabled Qt features.axis2010-05-031-2/+2
| | |
* | | teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)Oswald Buddenhagen2010-04-301-8/+7
|/ / | | | | | | | | | | | | this is what prevented using QMAKE_LFLAGS_RPATH instead of the obsolete QMAKE_RPATH in our own qmake.conf files. Reviewed-by: Tobias Hunger
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-191-19/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Fixed configure check for gstreamer.Dmytro Poplavskiy2010-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Gstreamer should be detected not only when phonon or mediaservices are enabled, but also when they are not disabled. Reviewed-by: Justin McPherson
| * | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-2/+2
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * | configure; Fixes for changes to use mediaservices.Justin McPherson2010-04-161-2/+2
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy