summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-02-253-10/+17
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-243-2/+5
| |\
| | * unhack qt_install_headers vs. lib_bundleOswald Buddenhagen2016-02-192-2/+2
| | * load qt_common in qt_helper_libOswald Buddenhagen2016-02-191-0/+3
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-181-8/+12
| |\|
| | * Use extra compilers for the linker version scriptSamuli Piippo2016-02-021-8/+12
| | * Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-022-0/+266
| | |\
| | * | support specifying directories in RESOURCESOswald Buddenhagen2016-02-011-3/+9
* | | | qmake: Fix name of header-only modules when doing simulator builds.Jake Petroules2016-02-251-0/+1
* | | | qmake: Fix unwanted concurrency in simulator_and_device builds.Jake Petroules2016-02-251-1/+3
|/ / /
* | | xcodeSDKInfo: return the correct path based on the specified SDK.Jake Petroules2016-02-181-1/+1
* | | Merge "Merge dev into 5.7" into refs/staging/5.7Oswald Buddenhagen2016-02-172-35/+26
|\ \ \
| * | | Generalize iOS simulator and device exclusive buildTor Arne Vestbø2016-02-122-35/+26
* | | | Revert "Fix shared library framework builds of Qt with a platform suffix."Tor Arne Vestbø2016-02-172-11/+1
|/ / /
* | | Fix shared library framework builds of Qt with a platform suffix.Jake Petroules2016-02-062-1/+11
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-022-0/+266
|\ \ \ | | |/ | |/|
| * | Add tool to namespace Objective-C classes at link timeTor Arne Vestbø2016-01-292-0/+266
| |/
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-1/+5
|\|
| * give the pkg-config wrapper a proper nameOswald Buddenhagen2016-01-211-0/+1
| * Make pkgConfigExecutable() work when a pkg-config is defined in the specChristian Strømme2016-01-211-1/+4
* | Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/devLiang Qi2016-01-268-83/+163
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-218-83/+163
| |\|
| | * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-192-1/+3
| | |\
| | | * qt_functions.prf: Add missing $$evalDmitry Shachnev2016-01-051-1/+1
| | | * Make -no-rpath build more useful on Apple platformsMartin Afanasjew2015-11-301-0/+2
| | * | CMake: Don't attempt gui-tests if Qt is built with -no-guiStephen Kelly2016-01-181-0/+1
| | * | unbreak propagation of dependencies on private modulesOswald Buddenhagen2016-01-131-1/+5
| | * | make module .pri files more flexibleOswald Buddenhagen2016-01-132-46/+62
| | * | Append the environment's QT_PLUGIN_PATH to 'make check' targetsRomain Pokrzywka2016-01-121-0/+1
| | * | disable install targets for non-prefix buildsOswald Buddenhagen2016-01-122-0/+18
| | * | rework include path construction in the module systemOswald Buddenhagen2016-01-123-35/+73
* | | | Update the Intel copyright yearThiago Macieira2016-01-211-1/+1
|/ / /
* | | Updated license headersJani Heikkinen2016-01-151-13/+19
* | | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-124-65/+58
|\| |
| * | Change the ELF linker version script creator to take no parametersThiago Macieira2016-01-112-33/+21
| * | fix docs creation in debug_and_release buildsOswald Buddenhagen2016-01-082-18/+25
| * | un-nest enabling .la creation from enabling .pc creation (again)Oswald Buddenhagen2016-01-081-13/+12
| * | don't build with explicitlib on unixOswald Buddenhagen2016-01-081-2/+1
* | | Merge remote-tracking branch 'origin/5.6' into devFrederik Gladhorn2016-01-0810-38/+97
|\| |
| * | fix doc builds in paths with spacesOswald Buddenhagen2016-01-081-7/+7
| * | Revert "use bindir instead of libdir when launching tools on windows"Oswald Buddenhagen2016-01-081-4/+2
| * | add always_prepend mode to qtAddToolEnv()Oswald Buddenhagen2016-01-081-3/+8
| * | rewrite qtAddToolEnv()Oswald Buddenhagen2016-01-082-14/+56
| * | Fixed recently added "excess colon in front of brace" qmake warningOliver Wolff2016-01-064-5/+5
| * | Remove CMake warningHarald Fernengel2015-12-281-2/+2
| * | Fix version script generation when cross-compiling from Windows to QNXMatt Hoosier2015-12-212-4/+18
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-185-14/+35
|\| |
| * | ensure that we don't leak QT_TOOL_ENV beyond qt_tool.prfOswald Buddenhagen2015-12-161-0/+2
| * | don't call qtAddToolEnv() directlyOswald Buddenhagen2015-12-152-13/+15
| * | automatically put TESTDATA into RESOURCES on android/ios/winrtOswald Buddenhagen2015-12-112-1/+18