summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-311-36/+13
|\ | | | | | | | | | | | | | | Conflicts: configure doc/src/modules.qdoc src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicswidget.h
| * do not detect the echo-without-newline syntax over and overOswald Buddenhagen2010-03-301-30/+12
| | | | | | | | | | this is a) more maintainable and b) faster, as it was done in the makefile generation loop as well.
| * speed up by removing nonsenseOswald Buddenhagen2010-03-301-6/+1
| | | | | | | | | | why first determine how to make no newline just to make a newline right afterwards?
* | Update PulseAudio config.test.Justin McPherson2010-03-291-9/+24
| | | | | | | | | | | | Originally by Thiago Macieira Reviewed-by: Justin McPherson
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-231-2/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits) Fix the test of QDirIterator with NoDot and NoDotDot Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot QFSFileEngine: don't look through NTFS junctions After showing modal windows, WM_LBUTTONUP for double click is ignored. Possible fix for missing QML properties in the qt.qhp file. Use standard theme icons in Linguist where possible Use more standard icons from the theme in Assistant Use more standard icons for standard actions in Designer Drag & drop operations wont end while using Remote Desktop sessions _close(fd) closes the associated handle and not the other way around Fixed locale mapping on Symbian. Revert change 7bf4512659 on Cocoa. Extended the high_attributes array, since we have more than 127 widget attributes now. Added instructions for MinGW users wanting to build the MySQL driver. Designer: Fix broken resource view. Add missing ,. get rid of build warning messages Quiet unnecessary configure/qmake warnings when EPOCROOT is not set. Add configure test for Maemo Internet Connection Daemon. fix warning ...
| * | Add configure test for Maemo Internet Connection Daemon.Aaron McCarthy2010-03-231-0/+44
| | | | | | | | | | | | Task: QTBUG-9156
| * | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-191-30/+92
| |\ \ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * | | - Fix importdir option on unix/linux configureHelio Chissini de Castro2010-03-181-2/+2
| | | |
* | | | Fixed usage of xplatform in configure.axis2010-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | XQMAKESPEC contains the full path, so don't use that, since the full path could contain "symbian" by accident.
* | | | Merge branch 'linux-symbian-sbsv2-support' into 4.7-s60axis2010-03-231-7/+41
|\ \ \ \
| * | | | Disable OpenVG for symbian-sbsv2 on Linux.axis2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | | | Moved -s60 and -usedeffiles options docs to Symbian section.axis2010-03-151-6/+5
| | | | |
| * | | | Forced little endianness when using symbian-sbsv2 mkspec.axis2010-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | | | Fixed incorrect platform string when building for Symbian.axis2010-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | | | Added -qt-style-s60 to Symbian configure options on Linux.axis2010-03-151-0/+31
| | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
* | | | | Fix configure false positives when checking for symbianThomas Zander2010-03-221-4/+4
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Just check the spec instead of the full path to the spec. This avoids false positives for testing for 'symbian' in the spec name when the path to the spec contains it instead.
* | | | 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.
generated by cgit v0.12 at 2024-11-16 09:55:04 (GMT)