summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-3/+3
|\ | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * Fixing a traling space on if statement that fails in Solaris.Sergio Ahumada2011-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 64e640716204af69056c34ddac5ce26628a1edd2 broke configure in Solaris. + /export/home/qt/config.tests/unix/fvisibility.test g++ no CFG_REDUCE_EXPORTS=no + [ no != no ] + [ no = auto ] + [ maybe = yes ] + [ no = yes] configure: test: ] missing Reviewed-by: Liang Qi
| * Add the auto detection for OpenGL in configure for makefile build system on ↵Liang Qi2011-04-011-3/+3
| | | | | | | | | | | | | | | | Symbian. Task-number: QTBUG-18485 Reviewed-by: Miikka Heikkinen Reviewed-by: axis
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-12/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * Switched back to using symlinks for all mkspecs on Linux.axis2011-03-251-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial revert of 7a19192fb418e40732ad72e0d4aaf83527958ded. The original special case was there to accomodate the fact that the Symbian master code line does not always build on a symlink capable file system. However, if we don't use symlinks, qmake's code to check for the symbian-sbsv2 scope fails if the mkspecs are not symlinks, so if anyone wants to bring this change back, qmake must be fixed first. Strictly speaking it is not necessary to remove both cp's as is done in this patch, but there is little point in keeping one and not the other. Task: QTBUG-17736 RevBy: Miikka Heikkinen
* | Unix configure: Add support for --sysrootThiago Macieira2011-03-291-0/+25
| | | | | | | | Reviewed-By: axis
* | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-171-5/+9
|\ \ | | | | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * \ Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-2/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/symbian-gcce/qmake.conf qmake/generators/metamakefile.cpp qmake/generators/win32/mingw_make.cpp src/corelib/global/global.pri src/corelib/global/qglobal.h src/opengl/qgl.cpp src/opengl/qwindowsurface_gl.cpp src/plugins/platforms/wayland/qwaylandbuffer.h tests/auto/qnetworkreply/tst_qnetworkreply.cpp tools/designer/src/components/formeditor/qdesigner_resource.cpp
| | * Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-141-82/+81
| | |\ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | * Readded a ';;' that was removed by mistake.axis2011-03-041-0/+1
| | | | | | | | | | | | | | | | RevBy: Trust me
| | | * Fixed mkspec detection for Symbian.axis2011-03-041-3/+2
| | | | | | | | | | | | | | | | RevBy: Liang Qi
| | | * Removed javascript-jit from default symbian-gcce build.axis2011-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | It fails the build anyway. RevBy: Liang Qi
| | | * Support to build Qt for Symbian on Mac OS X with gcce compiler.axis2011-02-211-79/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: axis RevBy: Morten Johan Sørvig Conflicts: configure
| | | * Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-181-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 Conflicts: src/s60main/s60main.pro
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-101-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Configuring a static Qt build did not exclude WebKit if the -webkit option was given.
| | * | | Configuring a static Qt build did not exclude WebKit if the -webkit option ↵Christian Strømme2011-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was given. Since the script only checked the value of canBuildWebKit when CFG_WEBKIT was set to "auto", a static WebKit build was still possible, this again resulted in build (linking) errors later in the build process. Note: The changes in this patch means that -static will take precedence over -webkit. Reviewed-by: Simon Hausmann
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-03-041-2/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (40 commits) Readded a ';;' that was removed by mistake. Fixed mkspec detection for Symbian. Removed javascript-jit from default symbian-gcce build. QAbstractSocket: Check for socket state on Unbuffered reads Corrected a mismerge in GCCE link parameters. QAbstractSocket: Check for engine validity on Unbuffered reads tst_qnetworkreply: fix the MiniHttpServer. tst_qnetworkProxyFactory: fix debug output. Fixed incorrect referral to an include file. tst_qnetworkreply: getErrors() only ignore warning for the specific test Check engine existence before increasing reference count Fixed library casing. Fix Q_INVOKABLE declared after Q_PROPERTY tst_qnetworkreply: small improvements QNAM: Add a warning for misuse of the file backend. Keep reference count for cached font engines in QTextEngine QNAM HTTP: Be more strict with HTTP channel state tst_qnetworkreply: Add a test for broken gzip encoding QNAM HTTP: Add qWarning() for double-finished() bug fix documentation typos in isLowSurrogate and requiresSurrogates ...
| | * | | Readded a ';;' that was removed by mistake.axis2011-02-281-0/+1
| | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | Fixed mkspec detection for Symbian.axis2011-02-251-3/+2
| | | | | | | | | | | | | | | | | | | | RevBy: Liang Qi
| | * | | Removed javascript-jit from default symbian-gcce build.axis2011-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fails the build anyway. RevBy: Liang Qi
* | | | | Lighthouse: Make sure we don't use xkbcommonJørgen Lind2011-03-161-4/+14
| | | | | | | | | | | | | | | | | | | | when we don't have it
* | | | | Lighthouse: Add pkg-config check for opengl es2Jørgen Lind2011-03-161-1/+10
| | | | |
* | | | | Rename qconfig-minimal-system-depenencies.hMorten Sorvig2011-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Rename to qconfig.nacl.h. This reflects that the config now enables all dependencies NaCl can support, not necessarily the minimal set.
* | | | | NaCl: Dont force release builds.Morten Johan Sørvig2011-03-161-2/+0
| | | | |
* | | | | NaCl: disable libtiff. Morten Johan Sørvig2011-03-161-0/+1
| | | | | | | | | | | | | | | (libtiff doesn't compile)
* | | | | Lighthouse: Add xkbcommon to pkg-config configuration of waylandJørgen Lind2011-03-031-4/+4
| | | | |
* | | | | Lighthouse: Make wayland configure check use pkg-configJørgen Lind2011-03-021-3/+16
| | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
* | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-011-78/+74
|\ \ \ \ \ | |/ / / /
| * | | | List the INTEGRITY drivers as wellRolland Dudemaine2011-02-221-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | If the INTEGRITY drivers are in the source tree, show them as available Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-031-7/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
| | * | 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
| * | Allow the user to select imageformats to be built as plugin vs internalBernhard Rosenkraenzer2011-02-021-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds what is already there for different plugin types to imageformats plugins -- allowing the user to configure which image formats will be built into Qt and which will be built as plugins. Merge-request: 1028 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-01-271-1/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (69 commits) Lighthouse: License headers to new files in testlite Make sure we blit the fbo on flush in QGLWindowSurface Lighthouse: Wayland. Make the wayland integration closer to Lighthosue Lighthouse: Wayland, only make one fbo for the WaylandPaintDevice Making clearer separation between responsibility of different classes Make it possible to vertically mirror gl painting Lighthouse:Wayland Moving some logic into files Fix Wayland plugin to work with Wayland after some interfaces changed Make QGLContext::fromPlatformGLContext show correct sharing Remove Lighthouse specific code from QGLWindowSurface Fix X11 clipboard bug. Fix for uninitialized member in QWaylandCursor wayland: use pkgconfig for libdrm in wayland.pro wayland: remove non-public header from config.tests wayland: fix SOURCES to point to wayland.cpp in config.tests Wayland: request rbg and premultiplied argb visuals as needed Wayland: clamp window resizes to screen size Wayland: split GL code into separate files Wayland: use correct viewport for swapBuffers and correct coords Wayland: fix geometry of swapBuffers ...
| * | | configure: fixed configure on mac.Rohan McGovern2011-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken due to conflict resolution in 5422e929cad04633a06c156cba96cfcd69262522 Since we now support compiling QPA (lighthouse) on Mac, the platform logic in configure becomes a bit more complicated.
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-75/+34
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| | * | 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
* | | | Make sure its possible to use qpa scope in use applicationsJørgen Lind2011-02-071-0/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | In user applications it should be possible to write something like qpa { HEADERS += Lighthousespecificheader.h } Reviewed-by: paul
* | | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-261-1/+1
|\ \ \ | |/ /
| * | 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
* | | Add wayland lighthouse pluginKristian Høgsberg2011-01-251-0/+5
| | |
* | | Configure: allow -no-framework for lighthouse.Morten Johan Sørvig2011-01-141-1/+1
|/ / | | | | | | (configure has trouble separating host and target platforms.)
* | 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
generated by cgit v0.12 at 2025-03-30 21:39:30 (GMT)