summaryrefslogtreecommitdiffstats
path: root/tools/configure
Commit message (Collapse)AuthorAgeFilesLines
* Support other platform names on configure.exeRafael Roquetto2012-10-302-9/+68
| | | | | | | | | | | | | | | | | | | | | | | Added three new methods, which are meant to be used internally to configureapp.cpp: - int platform(): returns an integer representing a platform - QString platformName(): returns the platform name string to be used when displaying the license agreement. - QString qpaPlatformName(): returns the value to be defined as QT_QPA_DEFAULT_PLATFORM_NAME. Currently supported names are Windows, Windows CE, QNX, Blackberry, and Symbian*. Default platform name is "Windows". * Symbian is not present on the original Qt5 patch. Symbian is not supported on Qt5. cherry-picked from qt5 b87c5cff24229b1bcc77ac68699f2f03acabc9e7 Change-Id: I6a97e00d59cce36804c857aa57c5754a2f6277db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Blackberry mkspecs: Refine compiler optionsPeter Hartmann2012-10-142-0/+38
| | | | | | | | | | | | | | | | | | | | | stack-protector-strong gives performance benefits over stack-protector-all and is still checking more than -stack-protector, so seems to be a good middle way and we want to use it when it is there. The -shared option for the compiler (not the linker) prevents a RIM internal version of qcc from forcing -fPIE, and should not harm in general when set. In addition, add a method "compilerSupportsFlag" for Windows as is present in the Unix configure script. Original-patch-by: Greg Bentz (cherry picked from commit 80f6d7862c0e2e41768620d5bd81b0e1d5e3f61f) Change-Id: I5867fc03dde1ef6e2fbf3747bdb9aaf15518eb6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* More copyright changes to Digia Plc in translations and toolsjutaipal2012-10-142-4/+4
| | | | | | | | Change-Id: Idb88b4e72548dfa641c6b8ce78a661fa61757ad0 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-298-194/+194
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* undo variable renaming in backportPeter Kümmel2012-09-171-1/+1
| | | | | | | | backport in commit fc6569921d4bc06e3d526f18d4b4cd3ef05c2025 was incomplete and broke building of configure.exe Change-Id: I2c8b3b38beeca5629bec5bb2ca814242b12f0318 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add msvc2012 supportPeter Kümmel2012-09-174-3/+11
| | | | | | | | | | | The only essential difference to msvc2010 is the define of _ALLOW_KEYWORD_MACROS. It is a documented breaking change: http://msdn.microsoft.com/en-us/library/bb531344.aspx Updated backport of qtbase/1a4f58d3e67f3d271d9e24d7f52950f796542d2f Change-Id: Iee8b900a214a9e5f289b2139d65f2e00c8113669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Never compile QPA with EGL support on WindowsNicolas Arnaud-Cormos2012-09-071-6/+10
| | | | | | | | It's a follow-up of d7168ae0ff930f19f206a1b56c03fc35b22bb948, which is doing exactly the same on linux. Change-Id: Id9eb996d2edf5867491fd420bdf743e0f799a778 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add cross_compile to qconfig.pri for global advertisingPeter Kümmel2012-09-071-1/+6
| | | | | | | | | | | .qmake.cache is not necessarily accessible to other modules which depend on information about whether we are cross compiling or not. We might as well advertise this fact globally via the CONFIG variable in qconfig.pri. Backported qtbase/3c47b52bd37488d41a3ad068de7976c838b7d63c Change-Id: Ie2566a44fb26e26af97c791e1ed1592fd650dbbd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Disable 3DNOW on Blackberry/Win32Rafael Roquetto2012-08-171-0/+1
| | | | | | | | | | | 3DNow is being incorrectly auto-detected on Windows, causing it to be enabled by default when cross-compiling to Blackberry. In other words, the code line introduced by this patch should have already been there since the beginning, but it got lost somehow. So here it is. Change-Id: Iad0b90908602633e3046b54c1c60139c6483632d Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add configure options for debug/release OpenSSLPeter Kümmel2012-08-152-10/+33
| | | | | | | | | msvc cannot use the same library for debug and release builds if openssl libraries are linked statically into the network library. Backported from 952788d64bc30c7aac5f9572533241ab8f48fb63 Change-Id: I8332b8293a27b6f9bd87ca1e6ebc63327589ab78 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Update contact information in license headers.Sergio Ahumada2012-08-018-16/+16
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add defaults for Blackberry platform on configureRafael Roquetto2012-07-301-0/+25
| | | | | | | Adds default values for Blackbery platform configuration on configure.exe. Change-Id: I11e4f7135d88fcc6133194d6a82863ae494c8c82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Set correct QT_LFLAGS_SQLITE for default cases.Rafael Roquetto2012-07-181-4/+9
| | | | | | | | | | In systems where no pkgconfig is available, such as QNX, we set QT_LFLAGS_SQLITE to the default values. cherry-picked from qt5/qtbase: a94e917eeb7b19eb19c3cf74d71a9b4cabfb1124 Change-Id: Iccf4e403a90e85b41c70895e1c91fe2d8f0eb573 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* New command line switches for configure.exeRafael Roquetto2012-07-161-2/+184
| | | | | | | | | | | | | | | | | | | Adds support for the following command line switches to configure.exe tool: * -qpa * -nis (-no-nis) * -neon (-no-neon) * -largefile * -little-endian (-big-endian) * -fontconfig (-no-fontconfig) * -system-freetype * -gnu-iconv * -sun-iconv * -posix-ipc based on qt5/qtbase: 1838a6c2fb5e3b4368c871aa330d028b255b83af Change-Id: I4a5adf09e4c0e312372b96dceb87ff3310e26ba6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Support mkspecs in subdirs for xcompile under windowsAndreas Holzammer2012-05-251-3/+11
| | | | | | | | | | | | Support mkspecs in subdirectories for cross compilation under windows. Mkspecs in subdirectories are separated by slashes. backport from qt5 a3a1fea094434e29c362caba711c7d9883461792 Change-Id: Id3954cc38df2922b20156589335faad989ec0537 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* compile without rttiOswald Buddenhagen2012-03-201-1/+1
| | | | | | | | no point in it Change-Id: Id6ad95c197095131c6c100afe37b3d48adb157d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit dc810b81a38a2a4d33f6909ff213809e1bf384ca)
* remove pointless include pathsOswald Buddenhagen2012-03-201-6/+0
| | | | | | | | we rely on a syncqt'd tree anyway Change-Id: I23b288b98a5e9289993b058f7dce02e19564c67a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 946501ab350f0c3dbaf163c03415f459efb8c6bd)
* properly enable stl via qmake instead of hacking compiler flagsOswald Buddenhagen2012-03-201-2/+1
| | | | | | Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit cb03577711a7dddd6444c0f6114fbf3785552353)
* build with QT_NO_GEOM_VARIANTOswald Buddenhagen2012-03-201-5/+1
| | | | | | | | saves us some pointless code Change-Id: I24e4fe4107f44ab579c0f951551c4138713a749f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 2091d4c33a0f20e44f64ecf9953bb7725ceed287)
* add missing errno.h includeOswald Buddenhagen2012-03-201-0/+1
| | | | | | | | it was masked by the precompiled header Change-Id: I9ba7b0faa716cfa6844b9a9f81fa2a3aa67f5da4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 2b969b89b95317f04bd562aee3528cab227e57b8)
* remove bizarre magic from precompiled headerOswald Buddenhagen2012-03-201-26/+1
| | | | | | | | it doesn't serve any puropse (any more?) and it breaks the mingw build. Change-Id: I02a5e7502586e7e9f5956991498ff602eff66e81 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 0678a7db8e8eb6997b0acb106dd4347ef8c76fbe)
* Add concurrent to QT_CONFIGSamuli Piippo2012-02-061-0/+2
| | | | | | | | cherry-picked from qtbase d21f28956e494baae311dc6d8f9dfbd4448965b5 cherry-picked from qtbase 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I8f7f9991fa197e737fe7f9af0ab949a5d48e7069 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Windows configure: make -mp affect the Qt build itselfJoerg Bornemann2012-02-021-3/+4
| | | | | | | | | | | Before -mp and -no-mp affected only projects built with Qt. There was no way to turn off msvc_mp for the Qt build. Qt projects can add msvc_mp themselves. Task-number: QTBUG-23929 Change-Id: I2f9f038ae64acec545fcd038842bba92a8736af4 (cherry picked from commit 41a5ca35591a735d9f07e2335d5827763d52c1f4) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make configure not complain about missing perl for non-dev. builds.Markku Heikkila2012-02-011-5/+11
| | | | | | | | | Fixed so that configure.exe is consistent with unix configure. Task-number: QTBUG-5710 Change-Id: I74f35ea269e9ca6648866542a2bd1a15cda09ac0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-118-8/+8
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Windows: Add gcc 4.6.Friedemann Kleint2011-11-163-15/+105
| | | | | | | - Add gcc 4.6 mkspec for > 4.4 (win32-g++-4.6) - Add detection of g++ version and 64bit to configure. Reviewed-by: mariusSO
* Perl check for windows configure.Markku Heikkila2011-09-071-11/+15
| | | | | | | | Works for Windows, *nix check is done by bash shell. Task-number: QTBUG-5710 Merge-request: 1362 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix configure after new import of WebKit.Alexis Menard2011-05-311-1/+1
| | | | | | configure.exe still needs to be regenerated. Reviewed by: Andreas Kling
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-138-138/+138
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Fix the build of configure.exe.Liang Qi2011-05-021-0/+2
| | | | | | | qlocale functions were splitted in severl files, just add them back. Task-number: QTBUG-18932 Reviewed-by: TrustMe
* Update the source file of configure.exe to enable QtConcurrent for SymbianLiang Qi2011-05-021-2/+0
|
* Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networkShane Kearns2011-04-121-4/+2
|\ | | | | | | | | | | | | | | Conflicts: configure.exe src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def
| * Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into ↵Shane Kearns2011-04-111-2/+32
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | symbian-socket-engine Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| * \ Merge branch 'symbian-socket-engine' of ↵Shane Kearns2011-03-081-4/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine Conflicts: src/network/access/qnetworkaccessmanager.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| | * \ Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-079-12/+42
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp src/network/bearer/qnetworksession.cpp src/network/kernel/qnetworkproxy_symbian.cpp src/network/socket/qnativesocketengine_unix.cpp tests/auto/platformsocketengine/tst_platformsocketengine.cpp
| | * \ \ Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2010-12-153-16/+35
| | |\ \ \
| | * | | | Symbian: Also force IPv6 on Windows configure.exeMarkus Goetz2010-12-081-0/+2
| | | | | |
| | * | | | Symbian: Enable IPv6 again.Markus Goetz2010-12-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native QSymbianSocketEngine supports IPv6 just fine. This reverts commit 0c7d5d106152924dedd822da8c90d9f3247a9947.
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * | | | | fix configure.exe option -opengl desktopMark Brand2011-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17997 Merge-request: 1161 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | Introduce QFontEngineDirectWriteEskil Abrahamsen Blomfeldt2011-03-141-2/+32
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a font engine for subpixel positioned text on Windows Vista (with platform update) and Windows 7. If selected during configuration, the engine will be selected only when the hinting preference of a font is set to None or Vertical hinting. The font database uses most of the same logic but creates a direct write font based on the LOGFONT rather than a GDI handle. The engine is currently regarded as experimental, meaning that code using it should do substantial testing to make sure it covers their use cases. Task-number: QTBUG-12678 Reviewed-by: Jiang Jiang
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-103-29/+66
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | | Fix regression in creating mkspecs/defaultMiikka Heikkinen2011-02-093-29/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy all files from original mkspec to default one and modify *.conf, *.prf, and *.h to include their original counterparts. Task-number: QTBUG-17258 Reviewed-by: Oswald Buddenhagen
* | | | fix windows configure compilation after lighthouse mergeOswald Buddenhagen2011-02-021-0/+2
| | | |
* | | | Allow the user to select imageformats to be built as plugin vs internalBernhard Rosenkraenzer2011-02-021-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-3/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * | | don't ignore return code from syncqtOswald Buddenhagen2011-01-171-1/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16176 Reviewed-by: mariusSO
| * | | make qtlibinfix apply to QT_INSTALL_TRANSLATIONSOswald Buddenhagen2011-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the unix configure already got it right Task-number: QTBUG-15978 Reviewed-by: Alessandro Portale Reviewed-by: mariusSO
| * | | don't claim declarative debugging support without having declarativeOswald Buddenhagen2011-01-171-2/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15228 Reviewed-by: mariusSO
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-178-8/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v0.12 at 2025-03-01 05:19:19 (GMT)