summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.Samuel Rødal2011-02-021-7/+16
| | | | | | | | | | | | | | | | Change e0c2861976e06658a1d651941310407c15b0bcde fixed es1 configure by only picking EGL/egl.h if GLES/egl.h is not found. This broke es2 configure on platforms where both EGL/egl.h and GLES/egl.h are present, by picking GLES/egl.h instead of EGL/egl.h, which implicitly pulled in the GLES/gl.h header as well, causing inconsistent declarations due to both GLES2/gl2.h and GLES/gl.h getting included. Instead, we need to prioritize depending on whether we're using es1 or es2. For es1, we prefer GLES/egl.h, and for es2, we prefer EGL/egl.h. If only one of the headers is found we still use it unconditionally, to preserve the existing behaviour and minimize the risk of breaking other platforms. Reviewed-by: Ritt Konstantin Reviewed-by: Marius Storm-Olsen
* don't accidentaly enable egl when disabling openvgRitt Konstantin2011-01-201-1/+3
| | | | | | Merge-request: 1027 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
* be more consistent about CFG_EGL_GLES_INCLUDES interpretationRitt Konstantin2011-01-201-1/+1
| | | | | | | | !"no" != "yes"; use the same condition in both places Merge-request: 1027 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
* fix build with -opengl es1 in some casesRitt Konstantin2011-01-201-5/+5
| | | | | | | | | | try <GLES/egl.h> first, and if that fails, try <EGL/egl.h>. if CFG_EGL_GLES_INCLUDES is "no", then QT_GLES_EGL is not defined and type re-definitions in GLES/egltypes.h and EGL/egl.h might occur later. Merge-request: 1027 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
* don't ignore return code from syncqtOswald Buddenhagen2011-01-171-2/+2
| | | | | Task-number: QTBUG-16176 Reviewed-by: mariusSO
* clean up platform detection logicOswald Buddenhagen2011-01-171-48/+12
| | | | | | | | it's pointless to check which files are present, as we only have all-platform packages now. Task-number: QTBUG-15685 Reviewed-by: mariusSO
* accept -declarative-debug under unixOswald Buddenhagen2011-01-171-2/+2
| | | | | Task-number: QTBUG-15626 Reviewed-by: mariusSO
* don't claim declarative debugging support without having declarativeOswald Buddenhagen2011-01-171-1/+3
| | | | | Task-number: QTBUG-15228 Reviewed-by: mariusSO
* Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | Reviewed-by: Trust Me
* Add extra type of embedded license.Jason McDonald2010-12-151-1/+1
| | | | | | Marketing needs this for commercial customers. Reviewed-by: Trust Me
* 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 ...
* 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.
* 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
* 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>
* 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
* 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 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
* 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
* 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.
generated by cgit v0.12 at 2024-11-02 10:19:30 (GMT)