summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-151-19/+21
|\
| * Added configure check to diasable building QtDeclarativeJørgen Lind2010-03-101-19/+21
| | | | | | | | when Qt is not building the QtScript module
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-5/+31
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * Changed TEST_COMPILER from CC to CXX in configure script.Zeno Albisser2010-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | We are using a cpp file for testing the compiler. Because of that we have to use a c++ compiler for the test as well. But if there was a CC variable defined, this one was used instead of CXX for the compiler test. This resulted in a missing QMAKE_LFLAGS definition in .qmake.cache. Due to this, the -L/path/to/QTDIR/lib was missing too and assistant could not be linked to libQtCLucene.so.4. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-8808,QTBUG-5471,QTBUG-5385,QTBUG-5774
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-061-1/+1
| |\
| | * fixed treatment of zlib on Mac when crossbuildingMark Brand2010-03-051-1/+1
| | | | | | | | | | | | | | | Merge-request: 478 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | fix corewlan detection error when building for 10.5 when 10.6 is alsoLorn Potter2010-03-061-1/+1
| |/ | | | | | | installed.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-041-1/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits) doc: Fixed some qdoc errors. Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text. Allow building documentation without all of Qt Added a documentation for the new enum value in gesture api. Remove the OBJECTS_DIR variable assignment from some projets in Qt. Fix compile qmake/MinGw: Link statically for Qt Creator to be able to detect it. Enable two fast path for blend_tiled_rgb565 Avoid QString reallocation for smallcaps fonts in Itemizer::generate() Make QLabel::text a reloadable property remove non wifi interfaces from being handled. Disable auto-uppercasing and predictive text for password line edits. Avoid QString reallocation in QTextEngine::itemize() Remove the Qt 4.7 #if guards that were needed for 4.6 Always redraw the complete control when an input event comes in. Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5) Fix compilation: include QString in order to use QString. Fix compile Block the Maemo5 window attribute values from being assigned to something else on other platforms. be more verbose when warning about incompatible libraries ...
| | * Mac: Select Carbon when using the 10.4u SDK.Morten Johan Sørvig2010-03-031-0/+9
| | |
| | * Always run syncqt if using a Git checkout.Thiago Macieira2010-03-021-1/+1
| | | | | | | | | | | | Reviewed-by: Olivier Goffart
| * | Add config.test for multimedia/qmlJørgen Lind2010-03-031-0/+15
| |/ | | | | | | | | | | using pkg-config from pri file is not good for cross-compiling Reviewed-by: paul
| * Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-271-0/+22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp
| * | Modified configure script not to override $XPLATFORM in case of CYGWINZeno Albisser2010-02-261-1/+3
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
* | | Consistently use the * in configureThomas Zander2010-03-091-1/+1
| | |
* | | Remove largefile config testThomas Zander2010-03-091-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | Somewhere in 2005 the code was changed to no longer run the exe but just to compile it which means that as soon as the simple exe compiled large file support was set to true. Removing the complexity and just setting the default to true in the configure script sounds like the honest thing to do :)
* | | Added Symbian def file support to Linux build system.axis2010-03-081-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also switches the official def file variable in qmake profiles to DEF_FILE. Support for freezing def files was also added, but needs more work and is therefore disabled for now. Task: QTBUG-7510 Task: QTBUG-8052
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-011-127/+238
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| * | Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-251-0/+22
| |\ \ | | |/ | |/| | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp
| | * Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-241-2/+17
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/qml/qml.pri src/multimedia/qml/qmlaudio_p.h src/multimedia/qml/qmlgraphicsvideo_p.h src/multimedia/qml/qmlmediabase_p.h src/plugins/qmlmodules/multimedia/multimedia.cpp
| | * | Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-241-0/+22
| | | |
| * | | Merge remote branch 'origin/master'Olivier Goffart2010-02-241-2/+18
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: configure src/plugins/mediaservices/mediaservices.pro
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-241-2/+17
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Add -mediaservice argument to configure. Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | | * Add -mediaservice argument to configure.Andrew den Exter2010-02-241-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables building the default media service backend for a platform. Is on by default if the build environment requirements are met and -no-mediaservice disables the option. Reviewed-by: Justin McPherson
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtRhys Weatherley2010-02-241-102/+134
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: configure
| | * | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-111-78/+53
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: configure
| | * | Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-111-4/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
| | * | | Fix Network Manager and CoreWlan config tests.Aaron McCarthy2010-02-081-1/+3
| | | | |
| | * | | Merge commit 'origin/4.6' into bearermanagement/integration-4Aaron McCarthy2010-01-291-25/+85
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/painting/qpainter.cpp src/s60installs/s60installs.pro
| | * | | | Add config.test for CoreWlan.Aaron McCarthy2009-12-221-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Untested, I don't have a mac.
| | * | | | Add compile test for NetworkManager.Aaron McCarthy2009-12-221-101/+116
| | | | | |
| * | | | | Detect GStreamer even when we're not building phononTom Cooksey2010-02-231-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Thiago
| * | | | | Add a configure test for XVideo supportTom Cooksey2010-02-231-1/+42
| | |_|_|/ | |/| | | | | | | | | | | | | Reviewed-By: TrustMe
* | | | | Added configure test for audio backend on Symbian.axis2010-02-251-1/+10
| | | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-161-78/+53
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
| * | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-4/+4
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * | | | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-31/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
| * | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-4/+4
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | | Merge branch '4.6'Thiago Macieira2010-01-131-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-081-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * | | | | | Our variables are our variables so we prefix them.Alexis Menard2010-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUTODETECT_COCOA -> QT_AUTODETECT_COCOA Reviewed-by:thiago
| * | | | | | Fix build on other platforms than MacAlexis Menard2010-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $CFG_MAC_COCOA has a default value of yes now so be sure we the platform is Mac before doing anything with it. Reviewed-by:thiago
| * | | | | | Select Carbon when building on 10.4 Tiger.Morten Johan Sørvig2010-01-061-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only perform the architecture check when "-carbon" has been specified on the configure line, as this is the only case where cocoa might have to be enabled on an arch by arch basis.
| * | | | | | Make Qt use Cocoa by default on Mac OS XMorten Johan Sørvig2010-01-061-37/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "-cococa" option is now deprecated, "-carbon" is added. This is mostly a behind-the-scenes change, but has some implications: If you are developing on Snow Leopard Qt vill be built in x86_64 mode by default. This can be overridden by configuring with "-arch x86" Qt for Cocoa will not build on 10.4 Tiger, nor will Cocoa-based binaries deploy back to that platform. Configure with "-carbon" if you want to target 10.4.
| * | | | | | Remove the entire warning, is seems it was only there forMorten Johan Sørvig2010-01-051-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Designer.
| * | | | | | Remove obsolete XShape configure warning.Morten Johan Sørvig2010-01-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task:QTBUG-2158 Designer no longer uses XShape for Drag and Drop.
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-121-8/+8
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.cpp qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro Conflict resolution was heavily based on manual application of commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
| * | | | | | fix whitespaceThomas Zander2010-02-021-4/+4
| | |_|_|/ / | |/| | | |
| * | | | | 'test -e' is a bashism. It's not available in traditional sh.Thiago Macieira2010-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7549 Reviewed-By: Markus Goetz
| * | | | | Cosmetic: move the "Alsa support..." line to a more appropriate placeThiago Macieira2010-01-251-2/+2
| | |_|/ / | |/| | |
* | | | | Disable sqlite plugin compilation on symbian by defaultThomas Zander2010-02-081-0/+8
| | | | |
generated by cgit v0.12 at 2025-01-01 06:39:32 (GMT)