summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * Add extra type of embedded license.Jason McDonald2010-12-151-1/+1
| | | | | | | | | | | | Marketing needs this for commercial customers. Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| * fix -dont-process for mingw cross-buildOswald Buddenhagen2010-12-101-1/+3
| |
| * fix nonsense conditionOswald Buddenhagen2010-12-101-1/+2
| | | | | | | | | | checking the stdout of a grep redirected to /dev/null is rather pointless. also, this code had a syntax error ...
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-14/+58
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Enable Phonon on Symbian by default.Oleh Vasyura2010-12-031-0/+3
| | | | | | | | | | | | Always enable Phonon on Symbian unless it was explicitly disabled. Reviewed-by: ossi
| * Disable OpenGL on Symbian only by default instead of alwaysOleh Vasyura2010-12-031-2/+4
| | | | | | | | Reviewed-by: ossi
| * VFP type on ARM option in Linux configure scriptOleh Vasyura2010-12-031-2/+27
| | | | | | | | | | | | | | | | Windows configuration tool uses -fpu option for VFP types. This option is used in Symbian releases but is not supported by Linux configure script. Reviewed-by: ossi
| * Adding -dont-process option to Unix configure scriptOleh Vasyura2010-12-031-7/+20
| | | | | | | | | | | | This option is supported by Windows configure tool and used in Symbian releases. Reviewed-by: ossi
| * build lrelease as part of the "libs" part.Oswald Buddenhagen2010-12-031-2/+2
| | | | | | | | | | | | currently it is a bootstrapped tool like moc, rcc and uic in src/tools/, so just force it into the same group. every qt build includes the libs part, so this will resolve the translation part's dependency.
* | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-291-5/+6
|\ \
| * \ Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-251-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (102 commits) fix inf loop bug Enable the no-undefined flag on the linker for icc Fixed tst_qwidget::winIdChangeEvent Prevent compilers optimizing eval timebomb code out of existence. Fix incorrect example for Qt.rgba() Flickable and MouseArea were too eager to take/keep mouse grab. Allow javascript date and regexp objects in WorkerScript messages Fix compliation of ALSA audio backend when checking for surround support. Avoid lockup in ListView when animating delegates. Fix asynchronous reload call in test, broken by previous submit Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Update QtGui emulator def file for bug QT-3971 Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Ignore .pc/ Ensure WebView press delay timer is cancelled when grab is taken. Prevent crash when calling reload() from within a .qml Doc: Fixing typo ...
| | * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| | | * Prevent compilers optimizing eval timebomb code out of existence.Jason McDonald2010-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable that holds the eval license key is a placeholder that is patched during package installation. Unfortunately, for a non-final package build, the placeholder is filled with nulls at compile-time and a clever compiler will optimize away most of the eval timebomb code due to a check in the eval code for the first character of the license key being null. This commit makes the variable that holds the license key volatile, to convince compilers that they cannot make assumptions about the contents of the variable when optimizing. Task-number: QT-3848 Acked-by: Thiago Macieira
| * | | Allow setting LD, RANLIB, OBJDUMP, and STRIP as one can do with autoconf ↵Sam Magnuson2010-11-251-1/+3
| |/ / | | | | | | | | | | | | | | | | | | scripts. Merge-request: 937 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | 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 branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-191-28/+30
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/gui/text/qfontengine_p.h
| * | 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
* | | Fix cross-compilation for Lighthouse after 3d86d2a8e5e3c68f9e0022e67629Paul Olav Tvete2010-11-011-1/+1
| | | | | | | | | | | | Reviewed-by: Morten Johan Sørvig
* | | Disable the ./configure -qpa [platform] flagJørgen Lind2010-10-281-5/+3
|/ / | | | | | | also fix what mkspec should be picked up when compiling on mac
* | 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
generated by cgit v0.12 at 2025-01-01 09:12:31 (GMT)