summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* write relative QT_INSTALL_CONFIGURATION also under windowsOswald Buddenhagen2015-03-061-1/+1
| | | | | | | amends 5b27d02c35. Change-Id: I5c8679ed746b81ca5a7f33f32c39a74ee1e03d5a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* use relative paths for build dir referencesOswald Buddenhagen2015-02-171-4/+4
| | | | | | | | apart from being more readable, it has the side effect of being resistant to spaces in the build path. Change-Id: Id12603c3a96765913e747fba4070d49de0705315 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Windows: Remove "experimental" sticker for DirectWrite engineEskil Abrahamsen Blomfeldt2015-02-141-1/+1
| | | | | | | | | | | | This engine has been regarded "experimental" for a long time, but it is in active use by some applications and rather stable. While if may be replaced by FreeType at some point, if support for Microsoft's colored fonts is introduced there, at this point it really doesn't make sense to call it "experimental" anymore. Change-Id: I038d71b121e90bd7b4dbc6d0afa7b14c9b824b08 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* MSVC: Remove use of -Zm argumentKai Koehne2015-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | We've been setting the -Zm argument since the dawn of times (even before the first git commit). Anyhow, MSDN from VS2008 onwards indicates that this is not needed: "In earlier versions of Visual C++, the compiler used several discrete heaps, and each had a finite limit. Currently, the compiler dynamically grows the heaps as necessary up to a total heap size limit, and requires a fixed-size buffer only to construct precompiled headers. Consequently, the /Zm compiler option is rarely necessary." [ChangeLog][Compiler Specific Changes] Visual Studio: -Zm200 (an option to specify the precompiled header memory allocation limit) is not added anymore by qmake to the compiler calls. If you encounter an C1076 compiler error you might need to re-add it in your .pro file. Change-Id: Ia4bec7eba09d893a7d81886a1814602b9ce7563c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* add /nologo to jom calls as wellOswald Buddenhagen2015-02-121-2/+2
| | | | | Change-Id: I7de0483ae17377d6682a4279ff3914aa78fc11a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix sign mismatch warningOswald Buddenhagen2015-02-121-1/+1
| | | | | | | amends 5b27d02c3. Change-Id: Ifcaab09619ba5b63ec7dfaba9bad2f1e7f270986 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Avoid hardcoding build date in qtcore and toolsSune Vuorela2015-02-121-2/+1
| | | | | | | | | | | | | | To ensure QtCore can be rebuilt and get the exact same results, it is undesirable to hardcode the build date into the library Also deprecate QLibrayInfo::buildDate since it is relies on the build date. QLibraryInfo::buildDate was originally meant for evaluation licenses and such, but isn't used for that any longer. Change-Id: I98e91ca3e55f877e6ac0e02de289dc29422fc9da Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-1110-71/+71
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* configure.exe: disable ANGLE backend for Linux targetsJochen Seemann2015-02-071-0/+1
| | | | | | | | As default, configure.exe checks if ANGLE is available and prints a warning if not. This isn't needed if the target platform is Linux. Change-Id: I2966965ea194c61bf9847e1ee130f2e765d5b0aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add libproxy backend for QNetworkProxyFactoryDaniel Molkentin2015-02-051-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | It will be used on Unix systems if the required dev package is present. (Detected by a configure compile test.) You can configure with -no-libproxy to avoid the dependency. It will not be used on OS X or Windows, as we already implement the native API for getting proxies there. Currently we use whatever PAC runner is provided by the distro for running PAC scripts - if we want to run PAC scripts using Qt, then we would have to implement a pacrunner plugin to libproxy. Note that their webkit pacrunner is using javascriptcore already. Tested using the libproxy 0.4.7 that is included in Ubuntu 12.04. Re-tested using Ubuntu 14.04 which ships libproxy 0.4.11. It works except when both socks and http proxies are configured in the manual settings - in that case libproxy returns only the socks proxy. This seems to be covered by libproxy issue 119. [ChangeLog][QtNetwork] Introduce libproxy backend for Unix platforms, enabled automatically if the required dev package is present Task-number: QTBUG-26295 Change-Id: I521c0a198fcf482386ea8a189114a0077778265c Reviewed-by: Richard J. Moore <rich@kde.org>
* improve support for cross-compilation to not directly supported platformsJochen Seemann2015-02-051-1/+9
| | | | | | | | | | | This adds a fallback platform OTHER to the platform-enum, which applies when -xplatform is set to an unsupported target, e.g. Linux. Without it, it would fall back to WINDOWS, with the consequence that logic like platform() != WINDOWS would break a proper configuration of Qt. Change-Id: Ie34522e23e375da6c24f66b3410638f85724a0f9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* introduce /dev variants of qmake propertiesOswald Buddenhagen2015-02-051-3/+3
| | | | | | | | | these reflect the on-target paths (unlike /raw, which are host paths, just without the -sysroot). this is necessary for anything deployment-related, starting with RPATH. Change-Id: I13d598995d0e4d6cb0dc1fc7938b8631cf3e3a95 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* write relative paths to qconfig.cpp as far as possibleOswald Buddenhagen2015-02-052-126/+191
| | | | | | | | | | | | | | | this cuts down the bloat in the binaries and the binary patching requirements in the installer. as a side effect, the sysroot and makespecs are not binary patchable any more as well, which is ok, as the installer does not do it anyway. we now also warn if -[host]<foo>dir is not a subdir of -[host]prefix, as putting things outside the prefix is anti-thetical (the obvious exception being the (unix-only) -sysconfdir). Change-Id: I878f0e71a4dfcfd55b2f8b1cf3045b98b502569b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* remove trailing semicolons from #definesOswald Buddenhagen2015-02-051-3/+3
| | | | | Change-Id: I522a7e838ab0e5bbe5b22296ab74912ea79468f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* don't overquote paths in qconfig.cppOswald Buddenhagen2015-02-051-34/+34
| | | | | | | | the function for emitting paths to .pri files is obviously not suited for C++ code. Change-Id: I96386d61334d06997475f044dbeab22a55749cef Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* base the libexec fallback logic on the makespecOswald Buddenhagen2015-02-051-1/+1
| | | | | | | this is consistent with the unix version. Change-Id: I84e15dd590b4ed9702f8a9dc0e8b655c930588d5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* simplify mkspec determination when writing qconfig.cppOswald Buddenhagen2015-02-051-9/+3
| | | | | | | | we don't actually support qualified specs anyway - all tests assume that they can use startsWith() on the spec name. Change-Id: I9dc8688858d4798c3a18c34757318dcd7fd47c57 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* configure --help clarifications relating to -*prefixOswald Buddenhagen2015-02-051-4/+7
| | | | | Change-Id: I71c78b7c91c9fedb7d55731b3f61d46ea75c9b8d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* make configure -redo and config.status able to handle spaces in argumentsOswald Buddenhagen2015-02-041-7/+3
| | | | | Change-Id: If6ffe381b03595885570ae431a9937c6fdce164b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* remove redundant CXX definitionOswald Buddenhagen2015-02-041-1/+0
| | | | | | | configure.bat adds it anyway. Change-Id: Ica0d49c08f3d0ddbc51c211d61da1150444c6782 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-211-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
| * Disable ANGLE builds for MSVC <= 2008.Friedemann Kleint2015-01-071-0/+5
| | | | | | | | | | | | Task-number: QTBUG-43475 Change-Id: If0f68ed6823564fd67219812334256936031f35f Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * configure.exe: improve error message by adding the filename.David Faure2014-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Before: Could not find output file: No such file or directory After: Could not find output file 'arch.exe' or 'arch' in C:/Qt/qt5/qtbase/config.tests/arch : No such file or directory (it turned out that linking in that directory failed because of a wrong %PATH%) Change-Id: I948d7f10f7e82f77a08ac9a8db76d97536c42dd0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Rename QML debug macro to Qt naming stylePasi Petäjäjärvi2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | With change macro is in line with QT_NO_<feature> style of naming macros. This way it will also be automatically added to file mkspecs/qmodule.pri in QT_NO_DEFINES value. Change-Id: I111d07fd015994290c54e00e8aac2d6dbdb7de9e Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-181-0/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d
| * Build Android style on Windows hostEskil Abrahamsen Blomfeldt2014-12-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The Windows configure application was missing the logic to enable the Android style, so this was missing from the Windows packages. [ChangeLog][Android] Included Android style on Windows hosts. Task-number: QTBUG-43302 Change-Id: I6a1423d58d00e7b4d4fd0a3d1a12cce10aa2fc91 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Add detection of and support for Visual Studio 2015Thiago Macieira2014-12-133-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Tested with the Preview release of November 2014. Differences to the 2013 detection and support: - Option -Zc:strictStrings is present in both debug and release mode and is passed to qmake's own build - New warnings 4456, 4457 and 4458 (shadowing) are disabled - Compiler supports -arch:AVX2 Change-Id: I9572ff4d4aded4004c1fa5d6f13ffee5462043d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update the names of Microsoft compilersThiago Macieira2014-12-133-26/+26
| | | | | | | | | | | | | | | | | | Microsoft hasn't called their compilers .NET since .NET 2003, so NET2005 and up were wrong. Change-Id: I28fa99d4e10fcc684be3096eb3237c916a80fa31 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove mkspecs and detection of Visual Studio .NET 2003Thiago Macieira2014-12-132-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This compiler is no longer supported, as the mkspec was moved to unsupported/ on commit 55c3799bd32d6fd8ec4b5fa26ebe3e5fdbbc91b3, but the MSVC support in qmake and in configure depend on an exact string match. So remove the remaining bits. No changelog because the actual removal happened in an earlier Qt release. Change-Id: I538345f4184a6af2ea7449052c161afe4eac625c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Android: Enable 64-bit configuration on Windows host platformEskil Abrahamsen Blomfeldt2014-11-071-4/+9
| | | | | | | | | | | | | | | | Default to android-21 when a 64-bit target is chosen, as this is the lowest API level supported for 64-bit targets. Change-Id: If4ece23911c3e9e45558906d970ef85a3b18b0bb Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Android: Default to newest toolchainEskil Abrahamsen Blomfeldt2014-11-041-1/+1
|/ | | | | | | | | | The recent NDKs have included the 4.9 version of the gcc toolchain, so we default to that instead of 4.8. This is also required for building for 64-bit targets, since the other toolchains do not support that. Change-Id: Id6908eb41c8e7cf003a9b134607ab2e55cb489e9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Check '-I' directories for auto-detection of featuresKai Koehne2014-10-231-1/+2
| | | | | | | | This allows e.g. openssl/openssl.h to be auto-detected if the include directory is passed via -I. Change-Id: Ib1d08ab2b7f98b4c08b7d6b66d55a55796f6802d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Android: Don't include Apache code under LGPLv2 licenseEskil Abrahamsen Blomfeldt2014-10-021-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code which extracts style assets for the Android style is licensed under the Apache license, which is not compatible with LGPLv2.1. It is, however, compatible with LGPLv3. This means that the Android platform plugin cannot be LGPLv2.1 as long as this code is included. To minimize licensing confusion, we default to only providing LGPLv3 for Android. If you want to build a LGPLv2.1-compatible library, you can add -no-android-style-assets to the configuration. This will in turn enable the LGPLv2.1 in the configure output, and it will disable the extraction code in the platform plugin. Running the Android style with an LGPLv2.1-compatible platform plugin will work, but it will look horrible. [ChangeLog][Android] Default open-source license for Qt for Android is now LGPLv3. For compatibility with the LGPLv2.1 license, add "-no-android-style-assets" to your configuration. Change-Id: I6c7b52140f38138520871fa7c69debbb4ee90e6c Task-number: QTBUG-41365 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove existence test for LICENSE.LGPL3Eskil Abrahamsen Blomfeldt2014-10-021-7/+3
| | | | | | | | This license file has to exist, since much of the code is licensed under LGPLv3. Change-Id: I2795a7cc62f6de65a35921e38d2ab5f8f0233f71 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add a way for qmake + configure to link dynamically to the CRTAndrew Knight2014-09-251-1/+1
| | | | | | | | | | | | | The static CRT, libcpmt.lib, is not shipped with Visual Studio Express for Windows (unlike VS Express for Windows Desktop or Professional versions), causing configure and qmake to fail linking if this is the only VS installed. By removing -MT (which is on by default) and adding $(CFLAGS_CRT) to the compiler line, -MD can be added to the compiler flags via the environment, providing a workaround for the issue. Change-Id: I5613346d60a3a1889c121f04d53b09fbb147fc02 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>