summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-161-53/+87
| |\ \ | | | | | | | | | | | | | | | | Conflicts: configure
| * | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-18/+37
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-151-7/+31
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Speed up qsTr() by caching the translation context Crash while printing from the portedcanvas example on Mac Cocoa. qdoc: Fixed .qdocconf files for assistant. Disable debug-only framework builds on Mac. Compile (with -no-pch) Add missing QT_NO_BEARERMANAGEMENT ifdefs. Introduce a qconfig feature for Bearer Management Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac Revert "Doc: Updating design files." Remove statically allocated pixmaps through the post routine qdoc: Checked for empty title. ...
| * | | Disable debug-only framework builds on Mac.Morten Johan Sørvig2010-04-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ("Fixes" WebKit build error with ./configure -debug) This puts the build system in an inconsistent state: We configure for debug only but still build both debug and release binaries. Use -no-framework of you want a pure debug build.
| * | | Bearer management changes from Qt Mobility (7a5ff985)Aaron McCarthy2010-04-141-6/+28
| |/ / | | | | | | | | | 7a5ff9859f5775915ae80c287f51c772599c2379
* | | Support building with desktop OpenGL managed via EGLTom Cooksey2010-04-141-52/+86
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mostly replaces lots of QT_OPENGL_ES defines with QT_NO_EGL instead. It also switches off EGL auto-detection by default. This is to make sure we default to using GLX on systems with both EGL and desktop OpenGL. If -opengl es1|es2 or -openvg is specified, then EGL auto-detection is switched back on (as a requirement. If configure auto-detects OpenGL ES it also switches on EGL auto-detection, but failue then just disables both EGL & OpenGL. As a side effect, this patch also fixes building Qt when both EGL and glx are avaliable, as they are in Mesa >= 7.8.0. Reviewed-by: Trond Task-number: QTBUG-9691
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-121-26/+126
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| * | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-26/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | Make shipped symbian scripts available from the build-dir bin dir.Thomas Zander2010-04-061-0/+11
|/ / | | | | | | Reviewed-by: Denis Dzyubenko
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-311-36/+13
|\ \ | |/ | | | | | | | | | | | | Conflicts: configure doc/src/modules.qdoc src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicswidget.h
| * do not detect the echo-without-newline syntax over and overOswald Buddenhagen2010-03-301-30/+12
| | | | | | | | | | this is a) more maintainable and b) faster, as it was done in the makefile generation loop as well.
| * speed up by removing nonsenseOswald Buddenhagen2010-03-301-6/+1
| | | | | | | | | | why first determine how to make no newline just to make a newline right afterwards?
* | Update PulseAudio config.test.Justin McPherson2010-03-291-9/+24
| | | | | | | | | | | | Originally by Thiago Macieira Reviewed-by: Justin McPherson
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-231-2/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits) Fix the test of QDirIterator with NoDot and NoDotDot Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot QFSFileEngine: don't look through NTFS junctions After showing modal windows, WM_LBUTTONUP for double click is ignored. Possible fix for missing QML properties in the qt.qhp file. Use standard theme icons in Linguist where possible Use more standard icons from the theme in Assistant Use more standard icons for standard actions in Designer Drag & drop operations wont end while using Remote Desktop sessions _close(fd) closes the associated handle and not the other way around Fixed locale mapping on Symbian. Revert change 7bf4512659 on Cocoa. Extended the high_attributes array, since we have more than 127 widget attributes now. Added instructions for MinGW users wanting to build the MySQL driver. Designer: Fix broken resource view. Add missing ,. get rid of build warning messages Quiet unnecessary configure/qmake warnings when EPOCROOT is not set. Add configure test for Maemo Internet Connection Daemon. fix warning ...
| * | Add configure test for Maemo Internet Connection Daemon.Aaron McCarthy2010-03-231-0/+44
| | | | | | | | | | | | Task: QTBUG-9156
| * | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-191-30/+92
| |\ \ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * | | - Fix importdir option on unix/linux configureHelio Chissini de Castro2010-03-181-2/+2
| | | |