summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-171-30/+92
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits) Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always Enabled dependencies for .dso and .lib libraries only. Switched to using DEF_FILE, which is the official variable. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-151-19/+21
| |\
| * \ 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
| * | | 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
| * | | | 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 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.
| * | | | | | Disable sqlite plugin compilation on symbian by defaultThomas Zander2010-02-081-0/+8
| | | | | | |
| * | | | | | Don't make an s60main dir for non-symbian buildsThomas Zander2010-02-081-0/+1
| | | | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-211-15/+53
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/platform_paths.prf
| * | | | | | | Fixed makefile generation for Symbian.axis2010-01-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables fast makefiles as well as intermodule dependencies. This hasn't been tested with the other Symbian build systems. It's quite possible that they will break because of this, but we will handle that at a later time.
| * | | | | | | Merge branch 'cleaningUpProfiles'axis2010-01-121-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Made sure that Symbian picks up STL.axis2010-01-121-1/+1
| | | | | | | | |
| * | | | | | | | configure/S60: Make work on Linux 64bit.Friedemann Kleint2010-01-111-2/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Acked-by: axis
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-181-60/+90
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/text/qfontdatabase_s60.cpp
| * | | | | | | | Disabled OpenGL on Symbian.axis2009-12-111-0/+7
| | | | | | | | |
| * | | | | | | | Disabled Qt3Support on Symbian.axis2009-12-111-2/+2
| | | | | | | | |
| * | | | | | | | Added support for -s60 option to configure.axis2009-12-111-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was required in order to enable the pieces of code inside QT_WS_S60.
| * | | | | | | | Switched to Symbian export rules when building.axis2009-12-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done by enabling the QT_DLL flag when configuring for Symbian.
| * | | | | | | | Revert "Modify visibility test to support armcc as well."axis2009-12-111-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1ca27669332b5e19284297b0bbc57700f59fed33.
| * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-061-4/+79
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Disabled some modules for S60.axis2009-10-231-0/+4
| | | | | | | | | |
| * | | | | | | | | Hack to allow -no-feature-foo on non-qwsSimon Hausmann2009-10-231-4/+0
| | | | | | | | | |
| * | | | | | | | | Modify visibility test to support armcc as well.axis2009-10-231-1/+5
| | | | | | | | | |
| * | | | | | | | | Make it possible to cross-compile for non-x11-non-qws platforms.Simon Hausmann2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't set PLATFORM_X11 unless we do have X11 libs in our xqmakespec.
* | | | | | | | | | Remove configure test for NetworkManager.Aaron McCarthy2010-03-151-15/+0
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NetworkManager plugin for Brearer Management no longer has a compile time dependency on NetworkManager. Task-number: QTBUG-9005
* | | | | | | | | Added configure check to diasable building QtDeclarativeJørgen Lind2010-03-101-19/+21
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | when Qt is not building the QtScript module
* | | | | | | | 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
| * | | | | | | 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
| | | | | | | |
generated by cgit v0.12 at 2024-09-04 12:11:34 (GMT)