summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Fix unnecessary regeneration of mocables in VS projectsJoerg Bornemann2016-12-212-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change dcd2f829 introduced fake files with the extension .cbt for custom build tools that generate code from C++ source inputs. The moc_predefs.h header file falls into this category, because it is generated from dummy.cpp. It turns out that these fake files have to exist. Otherwise the custom build step is executed on every build. That means re-moccing all mocables on every build. Fix this by actually creating the fake .cbt files with some explanatory comment in them. Task-number: QTBUG-57695 Change-Id: I251294334425d9914677787d8ba6da1169b4cca5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * micro-optimize FOO-=$$BAR for empty FOOOswald Buddenhagen2016-12-201-1/+4
| | | | | | | | | | | | | | | | | | | | | there is no point in iterating BAR if FOO is (or became) empty. Change-Id: I86c89bf0ad726a5ab7ead990a27ef7cc32caebbf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * fix conditionals on the spec after assigning QMAKESPECOswald Buddenhagen2016-12-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | this is of marginal value, as only our own code ever messes with QMAKESPEC, and we mostly stopped matching on the spec in favor of compiler and platform flags. Change-Id: Ibdd9a9c85067623f0f1f064d139d23b4e6b0677d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * make QMAKE_DIR_SEP magic on writingOswald Buddenhagen2016-12-202-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since ab0cc305, the spec will be replaced by an entirely new one during configuration, and so needs to update the path separator for $$shell_{path,quote}(). however, the latter didn't happen, as the spec reloading doesn't go through the "real" spec loading path. Change-Id: I45ab3156b8e040f683328ac46e48b09c2eb94ef7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Fix capitalization of <PlatformToolset>Joerg Bornemann2016-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tag was never spelled "PlatformToolSet". The correct spelling is "PlatformToolset" (lower case s). VS itself can load qmake-generated projects despite this misspelling, but tools like PVS-Studio are bothered by it. Task-number: QTBUG-57435 Task-number: QTBUG-57694 Change-Id: Ib70e8561f1827e195194bcf518445b2909a8d8c0 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Build Qt libraries with -fapplication-extensionJake Petroules2017-01-271-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures at compile-time that Qt libraries do not use any APIs that are not safe for use in application extensions, and fixes warning messages that appear when linking to Qt libraries that are not built with this flag, when used in an application extension. This is especially important on watchOS where *all* "applications" are actually application extensions, and on other Apple platforms if application extensions are developed using Qt. Task-number: QTBUG-40101 Change-Id: I022046f2584e0222253d33052b0abc221d7c93d6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Fix qmake -project in an empty folderJesus Fernandez2017-01-231-1/+1
| | | | | | | | | | | | | | | | Avoids iterating over the entire filesystem. Task-number: QTBUG-57569 Change-Id: If089842553978843de73559d1b1a567aa322a047 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Remove support for WinRT 8.1 and Windows Phone 8.1Maurice Kalinowski2017-01-185-50/+10
| | | | | | | | | | | | | | | | [ChangeLog][QtBase][General] Removed support for WinRT/Windows Phone 8.1. Task-number: QTBUG-57288 Change-Id: Ifd6d6780cbbdb710d99556ba3d2fb2e514d4f789 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Remove dead code in Xcode generatorJake Petroules2017-01-181-110/+5
| | | | | | | | | | | | | | | | | | | | These code paths have not needed to be exercised since Xcode < 3.2 was dropped from support, which is beyond ancient at this point. Incidentally, this removes use of a deprecated function. Change-Id: I3e5a45794c21b434b31a48da8a8b0ff22f2852fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | doc: Fix all remaining "Cannot tie" errors in QtBaseMartin Smith2017-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Most of these involved moving or removing extraneous aide-memoir comments left by programmers between qdoc comments and their functions. There were also some cases where Q_CLANG_QDOC had to be tested to make something visible to clangqdoc. And there were a few functions that should not have been documented at all. Change-Id: I3bf7c397a9e5ddbffc40cc1fee7f19cad71a1ae7 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1619-29/+127
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure configure.pri examples/widgets/painting/fontsampler/mainwindow.cpp examples/widgets/painting/fontsampler/mainwindow.h mkspecs/features/moc.prf src/corelib/global/qglobal.h src/gui/text/qtextdocument.cpp Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
| * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2016-12-166-12/+24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/global/qt-cpp-defines.qdocconf src/plugins/platforms/android/qandroidplatformopenglcontext.h src/plugins/platforms/android/qandroidplatformtheme.h Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4
| | * Merge remote-tracking branch 'origin/5.7' into 5.8.0Liang Qi2016-12-083-6/+8
| | |\ | | | | | | | | | | | | Change-Id: I576187a9905802c177ae483e6c29d0f55cf7034d
| | | * unbreak "aux" template for mingw & msvc, take 3Oswald Buddenhagen2016-12-073-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eliminating everying TARGET-related was a nice try, but in the real world (e.g., qttranslations), extra compilers are activated by PRE_TARGETDEPS, which of course doesn't work when TARGET is entirely gone. so instead, let it act as a phony target. this is consistent with the unix generator. supersedes 0810d48bc in amending af2847260. Task-number: QTBUG-57423 Change-Id: I3d2ecc4ff42b37ffe5f71f5c20d17c06b31f4da2 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * | Fix circular dependencies in generated vcxproj filesJoerg Bornemann2016-12-013-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QMAKE_EXTRA_COMPILERS with inputs that are "buildable" (e.g. C++ sources) the custom build step is added to the output file. From Visual Studio's point of view this looks like a circular dependency (e.g. foo.moc generates foo.moc). Usually this just prints a warning that can be ignored. But this circular dependency also breaks dependencies between custom build steps. This became noticeable when the generation of moc_predefs.h was added. Generating moc_predefs.h must be done before any moc custom build step is executed. This patch fixes the issue by using fake files (output file plus suffix ".cbt" for "custom build tool") that act as dummy inputs for the custom build tools. Task-number: QTBUG-16904 Task-number: QTBUG-57196 Change-Id: I4711e44a0551046d215db151fa0312af8a9177a2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * | Fix type of VcprojGenerator::extraCompilerOutputsJoerg Bornemann2016-11-303-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The values of this hash are strings, not lists of strings. Enforce this by using the proper type instead of just using a comment. Change-Id: Id8a13acdceb8f9f8a9a8eaa04e790b1e6cd5faa7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | qmake: introduce magic bypassNesting() scopeOswald Buddenhagen2016-12-133-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | will be needed by configure. Change-Id: If14e6944fe84767bd67604ecde98076f873749ef Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | move generation of qconfig.cpp (and qt.conf) to qmake-based configureOswald Buddenhagen2016-12-138-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this moves us another step towards the "outer" configure doing just minimal bootstrapping of qmake. a challenge here was that so far, qmake itself needed qconfig.cpp. this was replaced by usage of a qt.conf file instead of compiled-in values. however, to make the executable still self-contained, that qt.conf is embedded into it (by simple appending of a fixed signature and the text file). the qmake with the embedded qt.conf is not used for the qt build itself, which instead relies on the qt.conf in bin/ as before. however, due to the missing built-in values, this file now needs to contain more information than before. but except for a minimal version that is needed to start up qmake/configure at all, that file is now also generated with qmake. as some of the newly set up properties are subsequently used by configure itself, qmake gains a (deliberately undocumented) function to reload the qt.conf after it's fully populated. unlike the old implementations, this one doesn't emit redundant qt.conf entries which match the hard-coded fallbacks. omitting them leads to leaner files which are more comprehensible. Started-by: Paolo Angelelli <paolo.angelelli@qt.io> Change-Id: I4526ef64b3c89d9851e10f83965fe479ed7f39f6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * | | make qmake abort when $$prompt() gets EOFOswald Buddenhagen2016-12-134-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, infinite loops can result, as amply demonstrated by the new configure (which duly replicated the old configures' behavior ...). QMakeEvaluator::evaluateBuiltinExpand() now returns a VisitReturn like all other evaluate*() functions. the string list return value is now an out parameter; i used a reference instead of a pointer to avoid adjusting 56 usages of it. Task-number: QTBUG-13964 Change-Id: I51ca7df8d694c6ffe9d9899cba414b1b46f5ce95 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Fix typo in autogenerated *.pro file commentEdward Welbourne2016-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phrase "which as been" lacked an h (albeit one silent in some anglic dialects). The added letter made an already long line stick out just a little more. Judicious rephrasing of the early part of its sentence made reflow a way to fix that. Change-Id: I29c2ac79d08a135dd4a16518f459872c8ecd1f24 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1316-50/+155
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/Makefile.unix.macos qmake/Makefile.unix.win32 qmake/generators/win32/msvc_vcproj.cpp src/3rdparty/pcre/qt_attribution.json src/corelib/io/qsettings.cpp src/corelib/kernel/qdeadlinetimer.cpp src/platformsupport/kmsconvenience/qkmsdevice.cpp src/platformsupport/kmsconvenience/qkmsdevice_p.h src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h tests/manual/qstorageinfo/printvolumes.cpp tools/configure/configureapp.cpp Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e
| * | | Do not write empty custom build tool on VCConfiguration levelJoerg Bornemann2016-12-022-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is superfluous. Change-Id: Iac96938c6a7e899244534747a2f8a60bdbbdeb62 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | | Remove superfluous VCFilterFile::operator==Joerg Bornemann2016-12-021-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The default-generated operator is fine. Change-Id: I9acb310aaf551d8da3c0fd9aea65d77ee62a45b4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | Remove unused VCFilterFile::additionalFileJoerg Bornemann2016-12-021-5/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I67716404d38f41ee4f558dc5d82c9ae80a6956f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | qmake: fix execution of depend_command in directories with funny namesOswald Buddenhagen2016-11-303-3/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | it's wrong to use the escape function for makefiles, as the command goes directly to a popen() call. Task-number: QTBUG-57343 Change-Id: I34a8e4d8fb406303c593e7c1e24019e0f756e7f8 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-253-14/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qcoregraphics.mm src/gui/painting/qcoregraphics_p.h src/plugins/platforms/cocoa/qcocoahelpers.h src/plugins/platforms/cocoa/qcocoahelpers.mm Change-Id: Ibe5efcae73526b3d3931ed22730b13d372dcf54e
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-253-14/+28
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qml_module.prf src/corelib/tools/qdatetimeparser_p.h Change-Id: I5382cee3ddb33107dc61ee20f7a9188c4a68a882
| | | * unbreak "aux" template for mingw & msvc, take 2Oswald Buddenhagen2016-11-233-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of course, we should stub out everything related to TARGET - only the generic "all" and "first" targets including their deps should be emitted. amends af2847260. Change-Id: I8ed7a550b8022c69328d2e16dbd078928d176964 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | * qmake: fix up dist targets for mingw & nmake somewhatOswald Buddenhagen2016-11-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actually pack the extra compilers' input files, not the variable names. unlike on unix, we don't create an actual distdir, so the package is still going to be rather broken. Change-Id: If0a15bbe9db95aebd88c2a21ca3c0f787ce5c7e1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-245-3/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/socket/qnativesocketengine_winrt.cpp tools/configure/configureapp.cpp tools/configure/environment.cpp Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-235-3/+32
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also reverts commit 0d2f0164f45cb626c40a7c95026ba00fa56ac249. Conflicts: header.BSD-NEW qmake/Makefile.win32 src/openglextensions/qopenglextensions.cpp src/openglextensions/qopenglextensions.h src/winmain/qtmain_win.cpp src/winmain/qtmain_winrt.cpp tools/configure/configureapp.cpp util/glgen/qopenglextensions.cpp.header util/glgen/qopenglextensions.h.header Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8
| | | * Document QMAKE_OBJECTIVE_CFLAGSJesus Fernandez2016-11-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-57264 Change-Id: Iae06d9428d320a99cfd070154ed7bc94ec450b91 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | | * Add support for Visual Studio 2017Oliver Wolff2016-11-224-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested with RC Task-number: QTBUG-57086 Change-Id: I21f56edca3852b52edd2c5fdcce76817141e8d4a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | configure: put more of the makefile contents into template filesOswald Buddenhagen2016-11-235-3/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... instead of having (duplicated) code in the configures to create it. Change-Id: Ia86b44021a024a969f5a49b7fb18d3d414869f93 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | configure: delete some dead code and outdated commentsOswald Buddenhagen2016-11-233-15/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I764a9b383176e1fe9573790547ce0e12d1f88261 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-1710-53/+144
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/mac/default_post.prf mkspecs/features/uikit/default_post.prf Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-165-29/+53
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/linux-android.conf src/gui/opengl/qopengl.h src/network/socket/qnativesocketengine_winrt.cpp src/network/socket/qnativesocketengine_winrt_p.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/api/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp sync.profile Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-155-29/+53
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/plugins/platforms/eglfs/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b
| | | * don't create bogus property variantsOswald Buddenhagen2016-11-141-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sysroot, spec, and xspec have no /src and /get variants. Change-Id: I8548791f8ea6ba9fd9f10c35f914ed6badbea9d4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | * fix $$section()'s bad argument count error messageOswald Buddenhagen2016-11-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the autotest was also broken, because it was created by pasting the bogus message into the result ... Change-Id: I02b8663b96c7d96cdb3c19639e2213e49fd2bcec Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | * vcxproj generator: Support the /DEBUG:FASTLINK option of VS 2015Joerg Bornemann2016-11-043-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make qmake understand the /DEBUG:FASTLINK option in QMAKE_LFLAGS, and write the corresponding value correctly to VS 2015 project files. Task-number: QTBUG-55591 Change-Id: I670375ed1523a5ab96bb3cce28635785564edba8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | | build qmake.exe directly in bin/Oswald Buddenhagen2016-11-151-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so far, qmake.exe was built in qmake/ and then copied to bin/, with possible errors in the second step ignored. this made no sense. this unifies the nmake makefile with the unix one; compare 46e51ce1d. Change-Id: Ieb9c7cd46f0be0501d17e297808ac1cdad1b3c4a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | qmake: make discard_from() patch up QMAKE_INTERNAL_INCLUDED_FILES as wellOswald Buddenhagen2016-11-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the file's effects are discarded, the mention of the file should be as well. Change-Id: I894b7e2b887dd34d18533b197bfa9d0d84d647e7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | qmake: let discard_from() discard function definitions as wellOswald Buddenhagen2016-11-151-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for completeness. Change-Id: I3ffc14e041408c773e277442828170e3df04ec8d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | qmake: add "undecorated" mode to $$prompt()Oswald Buddenhagen2016-11-152-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the normal mode forces the prompt into a pattern which may be undesirable. Change-Id: I01689c7a6573415801862348b32bafc6a609ed4a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | qmake: fix file name treatment in emission of extra targetsOswald Buddenhagen2016-11-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that is, adjust path separators and don't quote them. we already did that to some degree, but totally inconsistently, so it just didn't work for any targets with "fancy" file names. note that we don't bother doing that for recursive targets, as these are assumed to be identifiers. Change-Id: Ic75f003b71abc6fed03a4121b903ad5ee8253ed2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | ensure that QMAKE_QMAKE always ends in .exe on windowsOswald Buddenhagen2016-11-151-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I72d5eda83250a0c33af505005732c3f370a04c57 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | bump qmake versionOswald Buddenhagen2016-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there are plenty new functions, let's do this symbolic act. Change-Id: Iaeb88afa5e33cacd81dc0ea26e380a16af06a739 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * | | Improve QMake JSON errorAllan Sandfeld Jensen2016-11-151-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can not improve the result from JSON parsing without changing API, so instead recalculate the line and column based on input and offset. Change-Id: I54149233f71023aa5d30deff854d6f3406c5c48c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | winrt: Add documentation for verbatim manifest processingMaurice Kalinowski2016-11-151-0/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I4a2acc6844bd160b3ccdbcea4be1e1fbc1cc266d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 14:36:47 +0000