summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
| | | |
* | | | Modified configure script not to override $XPLATFORM in case of CYGWINZeno Albisser2010-02-261-1/+3
|/ / / | | | | | | | | | Reviewed-by: Thiago Macieira
* | | 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
* | | | 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
| * | | fix whitespaceThomas Zander2010-02-021-4/+4
| | |/ | |/|
* | | 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
| * | '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
| | |
* | | 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
| * | Fix passing of arguments to syncqtSimon Hausmann2010-01-081-1/+1
| | | | | | | | | | | | | | | | | | Escape the arguments variable properly. Reviewed-by: Thiago
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-071-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| | * | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | 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
| * | | Fix configure's error message to report correct OpenGL qmake varsMichael Fairman2009-12-301-3/+3
| |/ / | | | | | | | | | | | | | | | | | | e.g. QMAKE_INCDIR_OPENGL_ES2 Merge-request: 2279 Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
* | | 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.
* | NEON configure detection and initial blend function implementations.Samuel Rødal2009-12-181-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new NEON configure test and -no-neon configure option. NEON implementations can also be turned off by setting the QT_NO_NEON environment variable. Performance improvements (in frames per second): - Blending ARGB32 on RGB32/ARGB32, mostly opaque: 71 % - Blending ARGB32 on RGB32/ARGB32, no opaque pixels: 108 % - Blending ARGB32 on RGB32/ARGB32, with 0.5 opacity: 158 % - Blending RGB32 on RGB32/ARGB32, with 0.5 opacity: 189 % Task-number: QTBUG-6684 Reviewed-by: Gunnar Sletta Reviewed-by: Paul Olav Tvete
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-171-9/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix compilation with -static on Mac OS X Configure support for multiple include levels in qmake.conf hierarchy. Stop the configuration if the test compiler cannot be found.
| * | Configure support for multiple include levels in qmake.conf hierarchy.Harald Fernengel2009-12-171-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a configuration file included in qmake.conf had an include statements of its own, the variables defined in the second level of included files were not parsed by getQMakeConf function from configure. Author: Adrian Constantin <adrian.constantin@nokia.com> Reviewed-by: Thiago Macieira
| * | Stop the configuration if the test compiler cannot be found.Harald Fernengel2009-12-171-0/+4
| | | | | | | | | | | | | | | Author: Adrian Constantin <adrian.constantin@nokia.com> Reviewed-by: Thiago Macieira
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-161-2/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix precision loss warning (qreal vs. float on Windows) def file maintenance. def file maintenance. Fixed compile for S60 (.def file updates). QPlainTextEdit scrolling issue with folded paragraphs Designer: Show actions in action editor in QKeySequence::NativeText Fix up documentation examples for low-level audio. Add -audio-backend and -no-audio-backend configure option. audioinput and audiooutput examples not using isFormatSupported Qt fails to build on RHEL 4 and other older Linux versions because of
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-151-3/+18
| |\ \
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-12-141-2/+17
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | | * | Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-091-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow better control over audio backend used. Reviewed-by:Justin McPherson
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-151-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add an image allocation pool to the OpenVG paint engine Fix QMetaObject::connect and disconnect with "dynamic signals" Test fixed for Windows CE. Removed the chip demo for windows CE Compilation fix for Windows Mobile Make mkspec/unsupported/linux-host-g++ use correct include Add "nocopy" mode for seperate-debug-info to configure Optimized blur / drop shadow effects for the GL 2 paint engine. Fixed bug in graphics effects caching of graphics item hierarchies. Added InvalidateReason to invalidateCache to optimize effects Fixed bug in QGraphicsPixmapItem shortcut for graphics effects. Optimize QGraphicsItemEffectSourcePrivate::pixmap() for QGraphicsPixmapItems. Improved raster blur implementation. Determine QPrinterInfo's supportedPaperSizes on demand. Added vg to the performance section of the QPainter docs Stabilize test Fix warning in public header OpenVG .def file updates.
| * \ \ \ \ Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-141-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Add "nocopy" mode for seperate-debug-info to configureTom Cooksey2009-12-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was written by Harald Fernengel for Maemo5 port. This effectively just adds -g to QMAKE_CFLAGS & QMAKE_CXXFLAGS and is mainly for packagers who want to build Qt in release mode and still have debug symbols, but will want to strip those debug symbols out themselves (rather than let Qt do it). Reviewed-By: Harald Fernengel Reviewed-By: Thiago Macieira
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Update Polish translations Assistant: Add documentation for -remove-search-index. Designer: Handle "visible"-properties of item view headers correctly. Fix .gitignore to not ignore qdoc.pro Update polish translations Fix broken delete key, some cleanup. Assistant: Fix race condition in index creation. Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
| * | | | Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the ↵Mikkel Krautz2009-12-071-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | SDK to use. Merge-request: 2254 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Compile with -no-exceptions on Mac.Morten Johan Sørvig2009-12-081-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qfontdialog_mac.mm needs to handle exceptions thrown by Cocoa, even if Qt is configured with if -no-exceptions. This ads a bit of qmake logic for the benefit of a single file, but I would like to keep -no-exceptions working. The savings are significant (around 10-15%). Revby: Richard Moe Gustavsen
* | | Fix typo in configure.Thiago Macieira2009-12-031-1/+1
| |/ |/| | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-11-26 18:22:19 (GMT)