summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* delay application of -D/-I/-L/-l on windows as wellOswald Buddenhagen2016-05-191-3/+3
| | | | | | | | | | clearly, "the windows configure does not have any of this magic to start with" was flat-out wrong. Task-number: QTBUG-53312 Change-Id: I80ac10bc8b1581e61c57fcd97f25626990d120ec Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Adjust FreeType choice made by configureappJames McDonnell2016-05-121-3/+27
| | | | | | | | | | | | | FontConfig requires FreeType, so choosing the system FontConfig (there isn't a bundled FontConfig) means that the system FreeType must be used. QNX ended up configured to include the bundled FreeType and the system FontConfig which produced a fault when bundled FreeType structures got passed through FontConfig to the system FreeType. Task-number: QTBUG-52578 Task-number: QTBUG-51417 Change-Id: I56add73d34320c1d08f63b57cb0fef1ba06264e8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Change some QNX defaultsJames McDonnell2016-05-031-0/+2
| | | | | | | | | | | | Make REDUCE_EXPORTS the default for QNX. This is what the Linux builds use. The Windows builds should too. Turn on ICU detection for QNX. QNX has ICU. Task-number: QTBUG-52578 Change-Id: Ie65c6ff03c4eecf361727b3b6026338f686d9749 Reviewed-by: Dan Cape <dcape@qnx.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add the ability to change precompiled header useJames McDonnell2016-04-191-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Give the Windows configureapp the same -pch/-no-pch arguments found in the Linux configure script. Using command line arguments to enable/disable precompiled header use is preferable to mkspec changes. Make -pch the default for all toolchains. In particular, this makes -pch the default for QNX on Windows. Previously, QNX on Windows had an implied default of -no-pch. Precompiled headers are the default for QNX on Linux; they should also be the default for QNX on Windows. A 'dictionary["PCH"] = "no"' will need to be added in Configure::applySpecSpecifics for any toolchain that should default to -no-pch (none known at this time). -no-pch is implemented by putting a "CONFIG -= precompile_header" in qmodule.pri. This ensures that Qt is built without precompiled headers (as requested) even if allowing precompiled header use is the default for the toolchain. Task-number: QTBUG-52578 Task-number: QTBUG-11545 Change-Id: I1b59bc2d416c5ba169161c5b3cc13accd76eeac8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* qmake: Fix wince dll deployment in Visual StudioAndreas Holzammer2016-03-221-3/+5
| | | | | | | | | | | | | | | This fix repairs the mechanism to deploy Qt dlls as well as C++ runtime to a wince target in Visual Studio. Do this by adding a deploy section in the Visual Studio solution and adding the C++ runtime from the mkspec to the files deployed to the target. Deploy target path is set to what the wizard of Visual Studio defaults to. Before, the c++ runtime was only deployed for executables which were built as part of Qt. Task-number: QTBUG-50924 Change-Id: I478010dc16e35c68578281895aa3ae14b5c96bb4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* fix bad initializer for -optimized-toolsOswald Buddenhagen2016-03-211-1/+1
| | | | | | Task-number: QTBUG-51967 Change-Id: I5b4a3f0ff6358149bc338c6ac2e0b57638bdff7f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* wince: Adjust configure defaultsAndreas Holzammer2016-03-211-9/+0
| | | | | | | | | Remove outdated configure defaults to support features that get autodetected. Change-Id: Ia802ccd3fe9defa97e2667e81dff6e815a7b45b3 Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Allow overriding Android NDK host on WindowsEskil Abrahamsen Blomfeldt2016-03-101-1/+11
| | | | | | | | | | | | | | The -android-ndk-host argument to configure existed in the shell script, but not in the Windows version. When using a 64-bit NDK but a 32-bit host compiler (which is what we bundle with our SDK), we would not detect the correct NDK host, making it impossible to build Qt with this combo. [ChangeLog][Android] Added -android-ndk-host configure option on Windows. Change-Id: Ie6a92b66e6875ed53f46fe41ecced70c3ec67585 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* configure: Fix (Open)SSL detection on WinCEAndreas Holzammer2016-03-071-2/+2
| | | | | | | | | "ssl" should be defined when "openssl" is defined, and WinCE should default to autodetection of OpenSSL. (cherry picked from commit f2fbee5134c2c0b33bdddf0a6419f3c770e1f89c) Change-Id: I9110b245d66fac233eb2bfe89b26cb34cee3e291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Don't use QStringLiteral in comparisonsAnton Kudryavtsev2016-01-281-2/+2
| | | | | | | | | | | | | | | For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I761b2b26ab5b416bc695f524a9ee607dacf0a7b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* configureapp: Print FontConfig in "Third Party Libraries" sectionKonstantin Ritt2015-12-101-3/+3
| | | | | | | ...just like in config.summary Change-Id: Idb34cdd39f706d7a7e75dfc0388d0a1fdb1f2317 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* configureapp: Add missing empty line between paragraphsKonstantin Ritt2015-12-101-1/+1
| | | | | Change-Id: I0f6424471d64976a6c93876e18da3c77000d6390 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix swapped descriptions for [-no]-optimized-toolsKonstantin Ritt2015-12-101-2/+2
| | | | | Change-Id: I5953b83ec2b4adee953caea0cb1e39d54b78bebb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove Wow6432Node versions of Visual Studio registry keysJoerg Bornemann2015-12-083-10/+13
| | | | | | | | | | | | | The Visual Studio registry keys are stored in the 32 bit view. Extend qt_readRegistryKey with an option that enables the caller to choose the 32 bit or 64 bit registry view. We now read the Visual Studio registry keys from the 32 bit registry view even in a 64 bit build. Adding the next Visual Studio version will become a bit easier. Change-Id: I7300b992be6058f30a422e3f1fe0bafade6eea54 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Break line and end in full-stop in configure.exe failure message.Edward Welbourne2015-12-021-2/+2
| | | | | | | | When configure.exe doesn't know what -platform to use, its message is poorly-formatted (and unhelpful). This at least fixes the formatting. Change-Id: I0f9fa3106a86606255ba05e80730031f1548faec Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* introduce -optimized-tools optionOswald Buddenhagen2015-11-171-0/+16
| | | | | | | | | | | | | | instead of building host tools always in debug mode, follow the overall build type, and provide an option to override it. this supersedes the pre-existing -optimized-qmake option. however, that option never existed in the windows configure, and this legacy continues as far as qmake is concerned (msvc builds of qmake are always somewhat optimized, but not mingw builds). Change-Id: I42e7ef1a481840699a8dffff13fec2626af19cc6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* configure: set ltcg only for Qt modulesPeter Kümmel2015-11-031-3/+3
| | | | | | | | Adding ltcg to qconfig.pri enables ltcg unconditionally for everyone using msvc. Change-Id: Ie1d11612a10fcdcb27de41664141e661a17323dd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Move pointer size detection entirely to qprocessordetection.hThiago Macieira2015-10-261-7/+0
| | | | | | | | | | | | | | | | This commit removes the legacy ptrsize check, which was deficient because it did not work for multiarch systems (when we supported fat OS X binaries) and did not work for bootstrap builds because the size might be different when cross-compiling. Instead, let's rely on the predefined preprocessor macros to detect correctly. As a nice side-effect, this fixes 64-bit Android builds cross-compiled from Windows. Task-number: QTBUG-48932 Change-Id: I1d0f78915b5942aab07cffff140f9a52b9342f23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Configure: don't enable the WMF multimedia backend by default.Yoann Lopes2015-10-231-1/+1
| | | | | | | | | This means we now use DirectShow as default multimedia backend on Windows. Task-number: QTBUG-45597 Change-Id: If95bbb8e7b33d73d80f7ba42de63ac54539e15b8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* msvc2015: Align compiler flags with rest of Qt buildMaurice Kalinowski2015-10-201-1/+1
| | | | | | | | msvc-desktop.conf does disable the exception warning for building all modules, so use the same set of compiler flags for building qmake. Change-Id: I97026f3cb78e656e8de76e1c8afe19cec6501499 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add a deprecation warning to configure about -no-c++11Thiago Macieira2015-10-181-0/+8
| | | | | | | We'll remove it in Qt 5.7, so people ought to be notified now. Change-Id: Ib056b47dde3341ef9a52ffff13ef6caa91757a9f Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Move the official Qt version from qglobal.h to .qmake.confThiago Macieira2015-10-143-17/+24
| | | | | | | | | It's easier to parse than qglobal.h. The objective is actually to have macros with parts of the version number, so the major or minor numbers could be used in other preprocessor macros. Change-Id: I42e7ef1a481840699a8dffff1404eda1dd5c308d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* configure.exe: Add -verbose option.Friedemann Kleint2015-10-022-3/+19
| | | | | | | | Make it possible to inspect the output of the configure tests. Task-number: QTBUG-48525 Change-Id: If93d597679ae1b189dfdaa485852d34cad52593b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Make -dbus-linked the default on all platformsThiago Macieira2015-10-011-6/+8
| | | | | | | | | | | [ChangeLog][QtDBus] The QtDBus library now links directly to the libdbus-1 system library if it was detected at configure time. To force linking to the library, pass option -dbus-linked to configure; to force dynamically loading at runtime, use -dbus-runtime. Task-number: QTBUG-14131 Change-Id: Ie33d1f22f85b465ab0ce166b8f17b8491eae1c21 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* fix configure bootstrap on mingw with spaces in the builddirOswald Buddenhagen2015-10-011-1/+1
| | | | | | | the missing quotes would cause us to misdetect mingw as msys. Change-Id: I408c0e6bfc3cbfecd02c54904cf96ab79e0b6d88 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* "frame" execution of config tests preciselyOswald Buddenhagen2015-10-011-0/+2
| | | | | | | | | the purpose is to make build log parsers able to ignore build failures in verbose configure output. Change-Id: I01af2e019fd1b055fdfcf6749faeebacb7a39c3f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Auto-detect whether 64-bit std::atomic really worksThiago Macieira2015-09-221-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | The C++ standard says it must, but some badly-configured toolchains seem to be lacking support. In particular, for some 32-bit platforms without native support for them, GCC implements 64-bit atomics via out-of-line functions in libatomic. If that library is missing... well, then std::atomic 64-bit doesn't work and we mustn't try to use it. This was found when trying to compile Qt 5.6 for MIPS 32-bit: Linking library libQt5Core.so.5.6.0 .obj/qsimd.o: In function `std::__atomic_base<unsigned long long>::load(std::memory_order) const': /opt/poky/1.7/sysroots/mips32r2-poky-linux/usr/include/c++/4.9.1/bits/atomic_base.h:500: undefined reference to `__atomic_load_8' .obj/qsimd.o: In function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)': /opt/poky/1.7/sysroots/mips32r2-poky-linux/usr/include/c++/4.9.1/bits/atomic_base.h:478: undefined reference to `__atomic_store_8' Yocto bug report: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8274 Change-Id: I42e7ef1a481840699a8dffff140224d6614e5c36 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* WinRT: Display error message when configuring with -no-openglMaurice Kalinowski2015-09-141-0/+8
| | | | | | | | | | -no-opengl is not a supported option when compiling for WinRT or Windows Phone. Hence bail out early to avoid compilation errors at later stage. Task-number: QTBUG-48041 Change-Id: I449b8935b95f0b75139a0f7bfa13256ea3fe95e5 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add detection of C++14 and C++1z compiler featuresThiago Macieira2015-09-051-20/+46
| | | | | | | | | | | | | | | [ChangeLog][General Improvements] Qt's buildsystem now detects whether the compiler supports C++14 and experimental support for C++1z. If the compiler supports it, then Qt is automatically compiled using that support. \ This does not apply to user applications built using qmake: those are still built with C++11 support only. To enable support for C++14 in your application, add to your .pro file: CONFIG += c++14 (similarly for C++1z). Change-Id: Ib056b47dde3341ef9a52ffff13ef1f5d01c42596 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Detect which C++ standard edition the compiler defaults toThiago Macieira2015-08-252-3/+24
| | | | | Change-Id: I2991557a5cc74cd18e88ffff13f670bf25d5423e Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Windows: Include DirectWrite support by default if availableEskil Abrahamsen Blomfeldt2015-07-211-6/+7
| | | | | | | | | | | | | | | This will automatically add DirectWrite support if the required headers are found. The note about platform support from the help screen has also been removed, since Windows XP is not officially supported. Applications that need to run on XP can still build with -no-directwrite. Also changed the configure test to be a proper compile test, since cross-compiled builds for Windows CE may break otherwise. Change-Id: I7fc7bfb25f2f86ced8a4d4c78a69527de0273707 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* configure: Put qml-debug option into QT_CONFIGUlf Hermann2015-07-061-1/+3
| | | | | | | | This way we can exclude the connection plugins from being compiled if it's off. Change-Id: Ic5ea1d35ea9f5929420268a1aefebf0464d8520b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* configure.exe: Fix detection of DirectWrite for MinGW.Friedemann Kleint2015-06-161-1/+3
| | | | | | | Check on the correct library name. Change-Id: I10980a8ba3e3e96d368319af0d86d6fb339c03ff Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-036-35/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
| * configure: Show only LGPLv3 for WinRT & WinCEKai Koehne2015-06-011-1/+3
| | | | | | | | | | | | | | | | With Qt 5.5 we are changing the license of the Qt for the WinRT & WinCE ports to LGPLv3 / GPLv2+ / commercial. Change-Id: I221559c5c42b1dcda172eb85e6bfa53c91976b23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * configure: Remove COMMERCIAL_VERSION defineKai Koehne2015-05-274-17/+3
| | | | | | | | | | | | | | Not used anymore. Change-Id: I7db671008758e79598697e06e12f1b959bf479c6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * configure: Remove traces of "Snapshot" editionKai Koehne2015-05-271-3/+3
| | | | | | | | | | Change-Id: I7f2511e224d848bb820321be5dd190d8b3b8f1c4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Run license checker in qmakeKai Koehne2015-05-272-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for a valid license not only in configure, but also in qmake. To limit the runtime overhead we cache the day of the last run in a .stash file. This allows us to run licheck only for the top-level qmake call, and only once per day. This requires an updated licheck executable that supports the new check mode. [ChangeLog][Tools][qmake] For commercial builds, qmake now checks for a valid Qt license. This requires setting up a Qt Account (or .qt-license file) on the development machine. Change-Id: I2c2a05a4602cc661560568b76ddf520cb8134769 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Make Qt Edition available to qmakeKai Koehne2015-05-271-0/+3
| | | | | | | | | | | | | | | | Allow .pro, .prf ... files to check the edition (OpenSource, Evaluation, Preview, Enterprise ...) of the Qt installation. Change-Id: If2a8e3877d066b225b1777916cef1d23c65f8512 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * remove $INCLUDE/$LIB hack for mingwOswald Buddenhagen2015-05-122-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | mingw is not msvc, and nobody in their right mind would expect it to behave like it. [ChangeLog][Important Behavior Changes][qmake] Qt configure and qmake used with a MinGW spec will no longer emulate MSVC by picking up the INCLUDE and LIB environment variables. Use the -I/-L configure options to pass additional paths, as you would under Unix. Change-Id: I533bb97de34d14dcbd45e0416283a79f44096c67 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * rpath: use new DTAGS if availableOswald Buddenhagen2015-05-051-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this allows LD_LIBRARY_PATH to take precedence over the hard-coded rpath, which is the only sane thing to do (which is also why i'm not adding an option to disable it). this behavior is consistent with non-linux systems. the windows version has no auto-detection, just like for gold linker usage. Task-number: QTBUG-3069 Change-Id: Ief9ba032291c898d75d76ecc740390954382a804 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Deinline QRingBuffer classAlex Trotsenko2015-05-203-0/+5
|/ | | | | | | | Reduce the size of .text section in QtCore by 4.5KB and in QtNetwork by 26.5KB. Change-Id: If7998776166b9681c1e4b24c51d40444aa996d7a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Implement a more direct headersclean checkThiago Macieira2015-04-171-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test each include file directly, instead of doing a large #include. This verifies that each header is compilable on its own. One big advantage of doing it via a special compiler in qmake is that we skip pre-compiled headers, which has hidden build errors in the past. This solution is implemented by making syncqt produce a second list of headers. This list is the same as the list of headers in the source code to be installed, minus the headers that declare themselves to be unclean, via the pragma: #pragma qt_sync_skip_header_check This mechanism is applied only for public libraries (skipping QtPlatformSupport, an internal_module). This test is enabled only for -developer-builds of Qt because it increases the compilation time. On QtTest: the library only links to QtCore, but it has two headers that provide inline-only functionality by including QtGui and QtWidgets headers (namely, qtest_gui.h and qtest_widget.h). If those two modules aren't getting compiled due to -no-gui or -no-widgets to configure, we need to remove the respective headers from the list of headers to be checked. If they are being built, then we need to make QtTest's build wait for the headers to be generated and that happens when qmake is first run inside the src/gui and src/widgets directories. Change-Id: I57d64bd697a92367c8464c073a42e4d142a9a15f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* configure: take XQMAKESPEC into account when looking for files.Rafael Roquetto2015-03-261-2/+4
| | | | | | | | | When cross-compiling, locateFile() needs to look into the XQMAKESPEC directories instead. Otherwise, this will cause checkAvailability()/findFile() to report wrong results. Change-Id: Ia1b566b70cff039d8fd540bde3c7b4707338348a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* QNX: Fix compilation on Windows.Rafael Roquetto2015-03-261-1/+5
| | | | | | | | | This regression was introduced by commit c3e50db19990c5. It is also necessary to pass QT_NO_SHAREDMEMORY and QT_NO_SYSTEMSEMAPHORE when building on Windows. Change-Id: I584cc07de013c5797e096fbda983167268789c8d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add mingw GCC Version to qconfig.priEric Lemanissier2015-03-253-0/+27
| | | | | | | | | | | | This change adds missing variables in mkspecs/qconfig.pri about gcc compiler version when using mingw: QT_GCC_{MAJOR,MINOR,PATCH}_VERSION This is needed in case CONFIG += c++14 is used. Task-number: QTBUG-44142 Change-Id: I34c27f9154bb745a8ee75c777a0acbdbc5bda5a9 Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add auto detection for tslib support when using Windows configure.David Schulz2015-03-161-0/+11
| | | | | Change-Id: I83fb53ed23813e572d924b4c3d5da4aae6f32775 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Windows: Add -static-runtime configure optionKai Koehne2015-03-111-0/+16
| | | | | | | | | | | | | Support statically linking the MSVC/mingw runtime libraries without manually tweaking mkspecs. This is helpful for projects like the installer framework. MSVC does not support mixing MT[d]/MD[d] flags in different compilation units. The static_runtime option is therefore added to both QT_CONFIG and CONFIG. Change-Id: Ifd6dc9c362090457de8e2c62477d0445f9479722 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove neon command line options from configureappSamuli Piippo2015-03-091-9/+0
| | | | | | | | | | | Neon support needs to be enabled unconditionally in mkspecs, so removing -neon and -no-neon command line options from configure app. It now has the same functionality as configure script. Task-number: QTBUG-44690 Change-Id: Iaf5bf7ac4e11fcb798f643660e48a4ed3ce1036b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* adjust configure's path output to relative pathsOswald Buddenhagen2015-03-062-13/+25
| | | | | | | amends 5b27d02c3 (literally - i forgot to push the squashed commit). Change-Id: I2c588d13d5c79f9d1e4cb1ce46c4637574377c6a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>