summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Invert the buildkey logic for compilers.Thiago Macieira2010-09-281-4/+4
| | | | | | | | Make ICC use "g++-4" as the official buildkey, since it's supposed to be completely ABI-compatible. Keep the older build key for compatibility with plugins built with ICC prior to 4.7. Reviewed-By: Bradley T. Hughes
* Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-201-19/+31
| | | | | | | | With this patch one can configure with -webkit-debug to build Webkit with debug symbols without having to manually edit WebCore.pro. Merge-request: 816 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-171-2/+22
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make qml debugging work with command line arguments Fix example after changes to font.letterSpacing. Autotest and small fix for QDeclarativeFontLoader. Improve error messages Changes to objects returned from get() should emit itemsChanged() so Make it clear that private ListModel constructor is only for worker Remove duplicated move() implementations Doc changes Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit PathView didn't accept mouse events, preventing it from working in a Flickable. Moving items in a PathView caused PathView.onPath to be set to false. Fix worker agent to emit ListModel itemsChanged() correctly when set()
| * Make qml debugging work with command line argumentsLasse Holmstedt2010-09-171-2/+22
| | | | | | | | | | | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne
* | Ensure building of WebKit and QtConcurrent are disabled with SunCC.Pierre Rossi2010-09-161-1/+1
|/ | | | | | As there are versions of SunCC > 5.9 Reviewed-by: TrustMe
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-081-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Work around a compiler bug on 64-bit. Fix handling of braces/no-braces in QUrl::host / setHost. Changes (and minor corrections) to QByteArray documentation. QtWebKit: Update tag files to match the same content on qtwebkit.git QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit. QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit. uic: Fix compile breakage in case QT_NO_QT3_SUPPORT. uic: Improve messages. Tools (uic/rcc): Improve warning messages. QDir: Removed checks for existance of fileEngine QDir and QFileInfo shouldn't lose properties when detaching Another bug-o introduced in fixing QDirPrivate refactoring Reverting QDir::detach introduced earlier QFileInfo: Prepare for engine-less implementation Removed QFileInfoPrivate::initFileEngine Simplify QDir::cd QDir::makeAbsolute could self-destruct on failure QDir::operator= simplification QDirPrivate refactoring QDirPrivate refactoring ...
| * explicitly remove qt_webkit_version.pri when building with -no-webkitOswald Buddenhagen2010-09-071-0/+1
| | | | | | | | | | | | | | otherwise it would stay around from a possible previous build with webkit and confuse the heck out of the build system. Task-number: QTBUG-13459
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-4/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
| * Some small Solaris fixes.Pierre Rossi2010-08-311-4/+1
| | | | | | | | | | | | | | | | Sets the arch properly for solaris-cc-64-stlport on x86_64. This patch also removes three redundant lines in configure and disables qtconcurrent examples when it's not available. Reviewed-by: Thiago
* | make shadow builds not write into the source dirOswald Buddenhagen2010-09-061-9/+17
| | | | | | | | like mkspecs/features, mkspecs/modules needs special treatment.
* | Symbian: Disable IPv6 for nowMarkus Goetz2010-09-031-3/+7
| | | | | | | | | | | | OpenC does not fully support IPv6, therefore we cannot either. Reviewed-by: ogoffart
* | fix MinGW cross compilation with -debug-and-releaseMark Brand2010-08-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed two issues in the configure script that prevented -debug-and-release from working correctly: We now allow dual debug and release mode for MinGW. We follow configure.exe in *not* settting PRECOMPILED_DIR. This gives qmake the freedom to put the debug and release precompiled headers in separate directories. Merge-request: 794 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Introduce a second compatibility build key to Qt.Thiago Macieira2010-08-241-0/+32
| | | | | | | | | | | | | | | | | | | | | | Some compilers are compatible with one another. In particular, the Intel CC on Unix systems is compatible with g++ on the same system. We should be saving the ABI "name" in the build key, not the compiler name, but it's too late for that. Choose "g++-{VERSION}" as the standard ABI name and make ICC support that. Reviewed-by: Bradley T. Hughes
* | fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it didn't work for several reasons: - if the configures don't add webkit to QT_CONFIG, src.pro doesn't even know that it needs to build WebKit at all, so WebKit would never inject itself into the build. hen-and-egg problem. - the in-Qt build doesn't use WebKit.pro in the first place, so a proper recursive qmake would never create qt_webkit_version.pri. it worked under unix because configure collects all project files irrespective of the actual SUBDIRS structure. - a proper recursive qmake will cache the qt config, so the injection wouldn't be effective during the first qmake run so instead let the configures copy the pri file.
* | let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-231-1/+1
| | | | | | | | | | | | | | | | i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann
* | fix shadow builds with scratchboxOswald Buddenhagen2010-08-181-3/+8
| | | | | | | | | | | | | | seems it doesn't grok xargs -I. as some other unixes don't grok cp -s, we have two paths now ... Reviewed-by: joerg
* | Fix configure -help output. declarative module is built by default.Martin Jones2010-08-131-2/+2
| | | | | | | | Task-number: QTBUG-12840
* | fix loading of module configsOswald Buddenhagen2010-08-111-3/+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: fix error message when calling config.statusJoerg Bornemann2010-08-091-1/+1
| | | | | | | | | | | | | | | | Calling configure in a shadow build directory led to error messages when trying to delete the content of $$QT_BUILD_TREE/mkspecs. Task-number: QTBUG-12764 Reviewed-by: ossi
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-041-3/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | fix compilation with -plugin-kbd-*Oswald Buddenhagen2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | it certainly is not such a good idea to write mouse when one means kbd ... Task-number: QTBUG-12483
| * | Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBSMark Brand2010-08-041-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | fix inaccurate commentOswald Buddenhagen2010-08-041-1/+1
| | | | | | | | | | | | qtmultimedia doesn't need gstreamer. inspired by MR 762.
* | | Add support for -runtimegraphicssystem configure optionJason Barron2010-08-041-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Skipped rcomp check on Raptor.axis2010-08-041-15/+16
|/ / | | | | | | | | | | | | This is necessary in the case where Qt is built as part of the platform, where configure will run before all the tools are built. RevBy: Thomas Zander
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-021-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.
| * | configure: don't symlink the mkspecs/features directoryJoerg Bornemann2010-08-021-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
* | | Fixed configure on Solaris.Rohan McGovern2010-08-021-1/+1
|/ / | | | | | | | | | | | | | | Fixes: "test: argument expected" Need whitespace before closing ] . Reviewed-by: Toby Tomkins
* | Statically link to Qt based dependent librarys.Aaron McCarthy2010-07-281-37/+9
| | | | | | | | | | | | | | | | | | | | Some of the library dependencies of the ICD Bearer Management plugin use Qt. We include them in src/3rdparty and link against them statically to avoid the circular build dependency. Libraries that do not use Qt are still linked dynamically. The libraries which are statically linked are libconninet and libgq-gconf. Task-number: QTBUG-12354
* | Fixed plugin build key for Symbian builds under Linux.axis2010-07-271-1/+11
| | | | | | | | | | Task: QTBUG-8962 RevBy: Jason Barron
* | Fix quoting for module reading in qconfig.priSimon Hausmann2010-07-241-1/+1
| | | | | | | | | | | | Patch by Fathi Boudra <fathi.boudra@nokia.com> Task-number: QTBUG-12379
* | Make it possible for Qt modules to extend QT_CONFIGSimon Hausmann2010-07-231-0/+3
| | | | | | | | | | | | | | | | 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-221-0/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added silent behavior to the most important Symbian build steps. Fixed compiling with symbian/linux-armcc and configure -silent option Removed some warnings from armcc that are unneeded. Made the makefile build system use QMAKE_CFLAGS.xxx properly. Automatically disabled unsupported modules for certain compilers. Fixed an incorrect profile inclusion.
| * | Automatically disabled unsupported modules for certain compilers.axis2010-07-221-0/+7
| | | | | | | | | | | | RevBy: Trust me
* | | Switch the default value for configure's -separate-debug-info to "no".hjk2010-07-221-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | The "yes" case slows us down on several occasions: (a) the CRC version used slows down loading debug info when debugging a Qt application significantly, (b) it does not work wit gdb 7.2's dwarf indexing (again, much slower startup), and (c) (less important) the stripping takes extra time for each of us when building Qt. The flag is still supported for distributions or individuals that want to use it. Reviewed-by: brad
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-211-1/+99
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use aligned load for the blending of RGB32 over RGB32 tst_moc: workaround gcc bug. Some more change to the changelog Fix compilation with QT_NO_GRAPHICSVIEW Updates changes-4.7.0 Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET. Add a missing file in the config.test for SSE 4.2 Remove the masking when computing qAlpha() Add support for more vector instructions on x86 Workaround gcc bug, disable test with old version of gcc Do not crash due to a infinite recursion when using voiceover on MacOS doc: Fix qdoc errors for text related files QGraphicsItem: Animation leaves drawing artifacts when clipping is used. moc: Slot with complex template default value does not compile
| * | Add support for more vector instructions on x86Benjamin Poulain2010-07-201-1/+99
| | | | | | | | | | | | | | | | | | | | | | | | Add the configuration, autodetection, and the #define for vector instructions on x86. The configuration has been extended with SSE3, SSSE3, SSE4.1, SSE4.2 and AVX. Reviewed-by: Andreas Kling
* | | Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-108/+176
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/sql/drivers/drivers.pri
| * | | Fixed the definitions of file locations on Symbian using configure.shaxis2010-07-211-86/+101
| | | | | | | | | | | | | | | | RevBy: Trust me
| * | | Removed the need to specify -arch symbian when compiling on Linux.axis2010-07-211-0/+2
| | | | | | | | | | | | | | | | | | | | Task: QTBUG-11385 RevBy: Jason Barron
| * | | Fixed QT_NO_FREETYPE define.axis2010-07-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This define is also used by the OpenVG module, and therefore needs to be defined everywhere. RevBy: Jason Barron
| * | | Various configure fixes to make Qt compile with Raptor on Linux.axis2010-07-211-24/+81
| | | | | | | | | | | | | | | | | | | | | | | | Based on a patch by Oleh Vasyura <ext-oleh.2.vasyura@nokia.com>. RevBy: Jason Barron
* | | | Made developer builds use the build dir as prefix, also on Symbian.axis2010-07-211-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
* | | Make configure.exe accept -no-gif again, fix commentDaniel Molkentin2010-07-191-1/+1
| | | | | | | | | | | | Reviewed-By: Jason McDonald
* | | Link to the unsinstalled libraries first.Petri Latvala2010-07-161-1/+1
| | | | | | | | | | | | | | | Task-number: QT-3371 Reviewed-by: Harald Fernengel
* | | fix qconfig.h aliased header creationOswald Buddenhagen2010-07-141-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
* | 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
generated by cgit v0.12 at 2024-09-04 22:14:05 (GMT)