summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-08-016-195/+396
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure 5.7 now supports clang on android; but dev re-worked configure src/gui/kernel/qevent.h One side renamed a parameter of a constructor; the other added an alternate constructor on the next line. Applied the rename to both for consistency. tests/auto/tools/moc/tst_moc.cpp Each side added a new test at the end. .qmake.conf Ignored 5.7's change to MODULE_VERSION. configure.json No conflict noticed by git; but changes in 5.7 were needed for the re-worked configure to accommodate 5.7's stricter handling of C++11. Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
| * Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-266-195/+396
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qtemporarydir.cpp One side encapsulated a repeated piece of #if-ery in a local define; the other added to the #if-ery. Made its addition to the other's. src/corelib/kernel/qeventdispatcher_unix_p.h One side moved some members into a struct; this collided with a #undef check that neither side now has. Discarded the #undef part. src/gui/opengl/qopengltexturehelper_p.h 5.7 deleted a bunch of methods; not clear why merge got confused. src/tools/moc/moc.cpp One added a name to the copyright header; another changed its URL. Change-Id: I9e9032b819f030d67f1915445acf2793e98713fa
| | * configure and mkspecs: Don't try to find xcrun with xcrunGabriel de Dietrich2016-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Xcode 8 (beta 2) that tool is no longer available through xcrun. We resort to xcodebuild instead. Change-Id: If9d7b535c1cbac2caae0112b2003283aeff34fb9 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | * Android: Add support for clang compilerBogDan Vatra2016-07-205-193/+395
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Android] Added support for clang compiler Task-number: QTBUG-50724 Change-Id: I6147021b814fcb230d125c4450c554a7fea8f31e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * Change compiler flags for AndroidBogDan Vatra2016-07-191-18/+17
| | | | | | | | | | | | | | | | | | | | | Same as Google did here: https://android-review.googlesource.com/#/c/207721 Change-Id: I24b964aae6d79aa41b07a6de30da1d124609066d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Use pkg-config for RPi EGL detectionLaszlo Agocs2016-07-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The config test for eglfs-brcm would fail otherwise on modern Yocto-based sysroots, as these have no /opt/vc, but have a proper egl.pc that has the include path and libs. Task-number: QTBUG-50838 Change-Id: Ibe8dcfbfe9aabe00fd8c040e6e41a4479ccb39bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Change test's entry point only when actually building it for winrtMaurice Kalinowski2016-07-221-5/+5
| | | | | | | | | | | | | | | Change-Id: I14de901e8cf16d0172a4bd35611c17de753348be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | print an empty line after every reportOswald Buddenhagen2016-07-221-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise we get an unintelligible mess if multiple messages are emitted in the same category. also, there were already empty lines between categories, so it was also inconsistent. Change-Id: I5e6622bc8a5d2773bbd99124cedf4e3eb73b8a60 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | permit wrapping expressions in the json fileOswald Buddenhagen2016-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | the json parser passes line breaks verbatim, so we need to get rid of them ourselves. Change-Id: I3b71fe54dcaa8c3a2ff94e8ac4845f49dabe1663 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | make 'feature' report type always use the feature descriptionsOswald Buddenhagen2016-07-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are really meant for pretty-printing the summary in the first place, and were previously unused when this type was invoked explicitly (because of using a condition). adjust the neon/mips_dsp/mips_dspr2 descriptions to match the context and remove the now redundant "message" fields. Change-Id: I08558f342a0d9189a37145085e5470f91a9d0881 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | make firstAvailableFeature report type use the feature descriptionsOswald Buddenhagen2016-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | they are really meant for pretty-printing the summary in the first place, and were previously unused for this type. adjust the c++* descriptions to match the context. Change-Id: I2a76b5651892bf9bd6fec315e446bfdb7c3aee97 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | make featureList report type use the feature descriptionsOswald Buddenhagen2016-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | they are really meant for pretty-printing the summary in the first place, and were previously unused for this type. adjust the sse/avx/avx512 descriptions to match the context. Change-Id: Icf514718355c6ccd608d825b70296cc0383dbfe8 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | fix recognition of -no-verboseOswald Buddenhagen2016-07-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | while probably not too useful, the old configure does allow explicitly disabling verbose mode. Change-Id: If0585443c649a67f616b3668cc90b18fecde11ba Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | don't mention config.log in error messages when not applicableOswald Buddenhagen2016-07-221-3/+7
| | | | | | | | | | | | | | | Change-Id: I127bc23c667d337bbe2518e7364ca99db9a3163a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | don't error() out on user errorsOswald Buddenhagen2016-07-221-3/+6
| | | | | | | | | | | | | | | | | | | | | use the proper error reporting mechanism instead. Change-Id: I3afb0086e5cd672d3c0f441c429682850202024f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | make command line parsing error messages consistentOswald Buddenhagen2016-07-221-6/+6
| | | | | | | | | | | | | | | | | | | | | ... by adding some quoting and punctuation. Change-Id: I553171a0c001edc195fcf2e85f0f70bf2cfdd728 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devEdward Welbourne2016-07-2211-11/+34
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-1911-11/+34
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/library/qmakebuiltins.cpp qmake/library/qmakeevaluator.cpp qmake/library/qmakeevaluator.h qmake/project.h QMakeEvaluator: * evaluateConditional(): one side changed return type, the other changed a parameter type. * split_value_list(): one side changed a parameter adjacent to where ... * expandVariableReferences(): ... the other killed one overload and changed the survivor src/corelib/io/qlockfile_unix.cpp One side changed a #if condition, the other moved NETBSD's part of what it controlled. src/corelib/tools/qdatetime.cpp One side fixed a reachable Q_UNREACHABLE in toMSecsSinceEpoch(), the other moved it from the private class to the public one, in the midst of the "short date-time" optimization, which confused diff entirely. One side changed a QStringLiteral to QLatin1String, the other rewrote adjoining code. src/network/kernel/qauthenticator.cpp Both rewrote a line, equivalently; kept the dev version. src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h One side changed #if-ery that the other removed. tools/configure/configureapp.cpp One side added a check to -target parsing; the other killed -target. tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml tests/auto/testlib/selftests/expected_cmptest.xunitxml Regenerated using generate_expected_output.py I note that quite a few other expected_* come out changed, now. There was no git-conflict in src/widgets/kernel/qformlayout.cpp but it didn't compile; one side removed some unused methods; the other found uses for one of them. Put FixedColumnMatrix<>::removeRow(int) back for its new user. Change-Id: I8cc2a71add48c0a848e13cfc47b5a7754e8ca584
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-157-6/+26
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/library/qmakeevaluator.cpp One side changed the iterator to use ranged-for, the other changed its body; they only conflicted because the latter had to add braces around the body, intruding on the for-line. Trivial resolution. Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b
| | | * Set library strip flags on Apple platformsJake Petroules2016-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed in ab599a39313c22fd14cc5466cea5c61bbcdbba8e when QMAKE_STRIP was set as a side effect of adding support for separate debug info. Task-number: QTBUG-54212 Change-Id: I86dd040dbefec4c58879c7d029ed89dd8bad3daf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * generalize references to exclusive buildsOswald Buddenhagen2016-07-133-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exclusive_builds_post.prf (via default_post.prf) processes debug_and_release into BUILDS, so .prfs which can rely on being executed later (because they are loaded via CONFIG) can rely on BUILDS and related variables. Change-Id: I5677079ad5145bf493af17b4b60347208572fd21 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * remove redundant condition from private module use warningOswald Buddenhagen2016-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the whole point of the check is ensuring that the message is printed only once for each sub-project, so !build_pass alone is fully adequate. Change-Id: Ib8f821ead6709efc9bfa935e1d05f8caba02a814 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | | * Add warning when using pkg-config with a Qt build with it disabledSamuel Gaist2016-07-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a warning that will be shown when link_pkgconfig is used in a project but Qt's configuration has it disabled. This can happen when Qt is built before pkg-config has been installed or if it's not detected. This will avoid user losing time trying to make pkg-config work while Qt just ignores it. Change-Id: Ieeff8dd6784b9430cfebef355855ec1be91bc96e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * OpenBSD: add X11R6/lib to QMAKE_RPATHDIRRalf Nolden2016-07-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As OpenBSD ships its own X11, linker errors occur when not explicitly adding the X11R6/lib dir to rpath dirs. Change-Id: I75991e9d7de115d2d212a017d9c8f9aa93cecc27 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * OpenBSD: redefine g++/gcc commands to eg++/egcc to use newer gcc 4.9Ralf Nolden2016-07-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OpenBSD, the system compiler shipped is still gcc 4.2.1 but for proper C++11 support in Qt, QtCreator and Qt-based projects we need to use the compilers provided in ports/packages which have the binaries renamed to eg++/egcc. Therefore, redefine the variables from g++-base.conf to use the newer compilers. Change-Id: Ic8ea1c5d2c2c0263dad5ae85c8c747bcd3985b7d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | Enable -WX (warnings are errors) for MSVC 2015Thiago Macieira2016-07-151-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib57b52598e2f452985e9fffd1458b565f9bda0f8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-043-2/+5
| | |\| | | | | | | | | | | | | Change-Id: Ibd81cd1df4a0650d93fcb556a57be90be2e1f569
| | | * Fix the naming of an LLVM tool in common/clang.confThiago Macieira2016-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably was copied from the gcc equivalent. Change-Id: I87e17314d8b24ae983b1fffd14535b9d7f616a1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | | * NetBSD: add QMAKE_RPATHDIR for standard QMAKE_LIBDIRRalf Nolden2016-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetBSD is heavily dependent on using rpath, so we need to add the lib dir QMAKE_LIBDIR and QMAKE_LIBDIR_X11 to QMAKE_RPATHDIR explicitly to avoid linker errors. See http://www.netbsd.org/docs/elf.html for more info. Change-Id: I225143d5e2d9a125060b14e3a8a7953927d63b33 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * winrt: Set minimum SDK version to 10586Maurice Kalinowski2016-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10586 reflects Update 1, which is the mininum supported version for many months, hence reflext this in the manifest template as well. There are additional features (like drag and drop) which require and even later SDK version. However, they do not reflect the minimum. Change-Id: I6d71dc499c928ed98c8a25283e0b53994317bb00 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | Make moc obey the preprocessor environment variable for include pathsThiago Macieira2016-07-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C preprocessors augment their standard list of include paths from the environment: Unix preprocessors use $C_INCLUDE_PATH (for C) and $CPLUS_INCLUDE_PATH (for C++), plus CPATH for both, whereas MSVC uses the an environment variable simply called "INCLUDE". Handling this for MSVC is particularly important because the VCVARSALL.BAT script sets the necessary #include paths in the environment for important things. Without that being parsed, moc won't find some #defines, like WINAPI_DESKTOP_FAMILY. [ChangeLog][moc] qmake and moc now cooperate to use the Visual Studio environment variables (set by the VCVARSALL.BAT script) to find system include files. A possible consequence is that moc parses application headers slightly differently, depending on #if conditions that depended on macros that previous versions had not seen #define'd. Implementers of other buildsystems are advised to pass the --compiler-flavor=msvc option to moc. Change-Id: I7e06274214d1939b0124e5b4bf169cceaef9ca46 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | | | moc: get the system #defines from the compiler itselfThiago Macieira2016-07-201-4/+25
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for moc to properly parse #ifdefs and family, we've had QMAKE_COMPILER_DEFINES as a list of pre-defined macros from the compiler. That list is woefully incomplete. Instead, let's simply ask the compiler for the list. With GCC and family, we use the -dM flag while preprocessing. With ICC on Windows, the flag gains an extra "Q" but is otherwise the same. For MSVC, it requires using some undocumented switches and parsing environment variables (I've tested MSVC 2012, 2013 and 2015). The new moc option is called --include to be similar to GCC's -include option. It does more than just parse a list of pre-defined macros and can be used to insert any sort of code that moc needs to parse prior to the main file. Change-Id: I7de033f80b0e4431b7f1ffff13fca02dbb60a0a6 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | | Fix the linkerSupportsFlag configure test typeLars Knoll2016-07-151-1/+1
| | | | | | | | | | | | | | | Change-Id: Iefc874958d1f6d2447f9774a9c3cdf6d7a3b885b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Replace EXTRA_LIBS with EXTRA_LIBDIR and EXTRA_FRAMEWORKPATHLars Knoll2016-07-132-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Now that -l and -fw options are gone, using a combined EXTRA_LIBS makes no sense anymore and only complicates things. Change-Id: Ic12bf482f3bed041aff7f0891f008b1f34ae2b4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Set QMAKE_DEFAULT_INC/LIBDIRS on MSVCLars Knoll2016-07-131-0/+5
| | | | | | | | | | | | | | | Change-Id: I19b60e178e7cc3cc5f73e5a9f252f886c8678c3d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Fix log messageLars Knoll2016-07-081-1/+1
| | | | | | | | | | | | | | | Change-Id: I0192d3a3073038d98e72ce7abd3bf1ecae002989 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Remove the -target command line optionLars Knoll2016-07-054-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was only used to specify XP as a target which is not supported on 5.8 anymore. Clean up all associated special handling in the mkspecs and pro files. This effectively reverts change 10a0ac75. Change-Id: I420d73002912989f1a5be961a2d09277ec4a4425 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Get rid of the qt_no_framework setting in the CONFIG variableLars Knoll2016-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | It's only used in one place, where it's actually not required either. Change-Id: I5766d2b5f0c1083bbd58a9b9fb07cc67bbd46a94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Make more configure tests work on WindowsLars Knoll2016-07-051-12/+18
| | | | | | | | | | | | | | | Change-Id: I87d775de7b6d790a44bbc3c9598d617ad57d9d4c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Fix handling of -v/-verbose command line flags to configureLars Knoll2016-07-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This is not a feature that should get propagated to other configure runs, so simply hardcode support for it. Change-Id: Ieb1c33243154b3583e91061d3592d7e87c36f402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Call arch test through the new qmake based configure systemLars Knoll2016-07-021-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | Detect host and target architecture from within qmake, and set QT_ARCH accordingly. Change-Id: I30255f88c7645d197bd07355a1dff02b377cbbe8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Allow passing configure opts with two dashes againFrederik Gladhorn2016-07-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | The regexp were capturing too greedy: $$replace(c, "^--?(.*)", "\\1") changes --developer-build to -developer-build. Do not accidentally capture the second dash. Change-Id: I19586a1678fc3bf3f450ec31f5bd7e71e9514b34 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-07-019-20/+20
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure configure.json Change-Id: Iba032d9a29c273da2585632bc6e22bbafb961808
| * | fix default inc/lib path detection on msysOswald Buddenhagen2016-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using the Makefile target separator to determine the host system is of course not a terribly good idea. the correct variable to query would be DIR_SEPARATOR, which always reflects the host. however, a direct os query is less obscure in this case. Task-number: QTBUG-54346 Change-Id: I6bc1372a7c9a84a241a97f9f767f046b026411c3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | don't override user-provided dependencies for our extra compilersOswald Buddenhagen2016-06-238-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while the names of the compilers are actually an undocumented internal, we don't provide an actually working proper way to sequence extra compiler execution with build-time generated inputs when they are indirectly listed (as via .qrc files). Task-number: QTBUG-54299 Change-Id: I269c26512897b72706dc8b769aa47e8157c2a5c5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | pass pkg-config environment to qmake invocationsOswald Buddenhagen2016-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake tries to use pkg-config when the config.test contains PKG_CONFIG, which will of course fail without the sysrooted env vars. and unlike in the old configure, these don't become automatically available by virtue of the script simply exporting them. longer-term, the test programs shouldn't mention pkg-config deps explicitly, as these are redundant with what is specified in the JSON file. relevant changes are already pending. Task-number: QTBUG-54403 Change-Id: Ie9d3bbb2e4febffde5fd122d7d0a8b70b8679fcc Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | beautify generated spacingOswald Buddenhagen2016-06-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | don't have extra spaces in the pkg-config calls when no environment variables are injected. Change-Id: Ieb14f775b2a04726e8f62114b69d9be7fa662eb0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | use globally available constantsOswald Buddenhagen2016-06-281-9/+2
| | | | | | | | | | | | | | | | | | | | | configure_base.prf gained them in a bugfix in 5.6. Change-Id: I7763b3dcdfbcc6cfb0392ddc4b6556f926395111 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devLiang Qi2016-06-2320-15/+187
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-2320-15/+187
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/mac.conf mkspecs/features/configure_base.prf mkspecs/features/configure.prf mkspecs/macx-clang-32/qmake.conf mkspecs/macx-clang/qmake.conf mkspecs/macx-ios-clang/qmake.conf src/network/ssl/qsslsocket_openssl_symbols_p.h Change-Id: I768b592e8e589662b1fdb9b8cbd633fef26845b6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 04:31:39 +0000