summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-3/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * Don't set -mfpu=neon globally if the compiler supports neon.Samuel Rødal2010-11-111-3/+2
| | | | | | | | | | | | | | | | | | | | By default only drawhelpers and image loaders will now use neon. If -mfpu=neon has been explicitly enabled in the mkspec, QT_ALWAYS_HAVE_NEON will be defined, allowing the use of neon intrinsics elsewhere. Task-number: QTBUG-15163 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-5/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Fixed a shell syntax error in configureDenis Dzyubenko2010-11-101-6/+3
| | | | | | | | | | | | | | | | | | | | | | When you have EPOCROOT environment variable, but compiling for desktop Linux, the configure script showed a shell syntax error and failed to set the install prefix, making "install" target to install to the build directory. Task-number: QTBUG-15008 Reviewed-by: axis Reviewed-by: Oswald Buddenhagen
* | configure: Deal with multiple redefinitions of qmake variablesTor Arne Vestbø2010-11-051-14/+24
| | | | | | | | | | | | | | | | | | | | | | The function setBootstrapVariable() did not account for multiple definitions of the same variable, eg. QMAKE_CC=foo; QMAKE_CC=bar We now look for '+=' and only append the values if this is found, otherwise we reset the variable to the given value, and continue looking for extra values. Reviewed-by: ossi
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits) Optimize and clean up QClipData::fixup() There is no predefined qmake x11 scope for x11 builds. Refactor tst_QScriptContext::throwError test. Fixed whitespace. Don't use scopes in mkspecs as configure does not support them Fixed destination path for the S60 feedback plugin. Don't put Objective-C sources in SOURCES Fix regression in tst_maketestselftest::naming_convention. Split monolithic QScriptEngine autotests into smaller tests Add SunSpider and V8 benchmarks to benchmarks/script.pro Push and pop the thread-default context for the current thread Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined. Import SunSpider benchmarks for QtScript Import V8 benchmarks for QtScript Add more microbenchmarks for QScriptValue Add more microbenchmarks for QScriptEngine QNAM HTTP: Do not set cache headers when already set by user QNAM: Do not cache network connections per username. Refactor tst_QScriptValue::instanceOf Refactor tst_QScriptValue::getSetPrototype ...
| * | Don't use scopes in mkspecs as configure does not support themTor Arne Vestbø2010-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Configure has very basic parsing of mkspecs where it traverses includes, but assumes that the last seen value is the right one. Since this parsing does not take scopes into account we can't use tricks like isEmpty(). Reviewed-by: ossi
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-8/+2
|\ \ \ | |/ / |/| / | |/
| * simplify recursive symlinkingOswald Buddenhagen2010-11-021-8/+2
| | | | | | | | | | | | | | | | the jira issue itself has been already fixed, but in a somewhat arcane way. this one is better maintainable. Reviewed-by: joerg Task-number: QTBUG-14955
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-271-83/+77
|\ \ | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h
| * \ Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-261-83/+77
| |\ \
| | * | Support to build Qt for Symbian on Mac OS X with gcce compiler.Liang Qi2010-10-261-82/+76
| | | | | | | | | | | | | | | | | | | | RevBy: axis RevBy: Morten Johan Sørvig
| | * | Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-12/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * | | configure: Don't use character class when looking for QMAKE_CONF_COMPILERTor Arne Vestbø2010-10-191-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
| * | | removed obsolete -qt-gif configure optionMark Brand2010-10-151-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since "-system-gif" is not offered, offering "-qt-gif" is unnecessary and perhaps misleading. By default the GIF handler is built from code included with Qt, unless suppressed by "-no-gif". Merge-request: 859 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | configure: Don't assume that QMAKE_CXX will be found at the start of lineTor Arne Vestbø2010-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 86636e0c4ab introduced "isEmpty(QMAKE_CXX): QMAKE_CXX = g++" instead of "QMAKE_CXX = g++", which failed when configure was looking for QMAKE_CXX at the beginning of the line. We now allow either the beginning of the line or a space before QMAKE_CXX.
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-071-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Fix the icd auto config test after restructuring the icd plugin dependenciesAdrian Constantin2010-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove the auto config tests related to libicd-network-wlan-dev * Add test for the icd backend * Add test for connsettings See also f532d8fcd236be9933e4186a95561e1c264de277. Reviewed-by: Aaron McCarthy
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-4/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| | * | Made scripttools disabled on Symbian by default, like on Windows.axis2010-10-041-1/+8
| | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | * | Got rid of "No such directory" warning when shadow building.axis2010-10-041-3/+2
| | | | | | | | | | | | | | | | RevBy: Thomas Zander
| * | | Issue a warning and disable webkit build when xrender is disabled on X11Christian Strømme2010-10-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nsplugin fails to build when xrender is disabled and webkit is enabled. This commit modifies configure to automatically disable webkit on X11 when this situation occurs. Reviewed by: Simon Hausmann
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-0/+6
|\ \ \ \
| * | | | Lighthouse on OS X.Morten Johan Sørvig2010-10-201-0/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-051-21/+53
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-4/+4
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-4/+4
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| | * | 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
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-291-6/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Lighthouse: Remove auto building platform pluginsJørgen Lind2010-09-161-6/+0
| | | | | | | | | | | | | | | | Reviewed-by: paul
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-19/+79
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * | | Merge the armv6 and arm architecturesBradley T. Hughes2010-09-231-4/+32
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having multiple architectures, merge them and select the appropriate implementation based on what the compiler actually supports. The original qatomic_arm.h header has been renamed to qatomic_armv5.h, and qatomic_arm.h now does nothing more than including either qatomic_armv6.h or qatomic_armv5.h Since this changes the build-key for targets that previously used armv6, we need a 3rd compatibility build-key for the architecture. The configure script will always write out this build-key when building for arm (and silently converts -arch armv6 to -arch arm). Reviewed-by: thiago
| * | 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 remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-131-0/+24
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/gui/text/text.pri src/plugins/generic/linuxinput/qlinuxinput.cpp
| * | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-131-19/+66
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: configure src/corelib/tools/qsimd.cpp
| * | Initial pluggable fontdatabaseJørgen Lind2010-09-021-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformFontDatabase added. QPlatformIntegration now has a new virtual function: QPlatformDatabase::fontDatabase() const. Most unix platform plugins wants to follow the pattern implemented in directfb, linuxfb, vnc etc. In the pro file do: include(../fontdatabases/genericunix/genericunix.pri) In the QPlatformIntegration class do: and instansiate a QGenericFontDatabase in the constructor and return it in the getter function.
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-19/+66
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h src/corelib/tools/qsimd.cpp
| * | 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.
generated by cgit v0.12 at 2024-12-12 06:08:47 (GMT)