summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-061-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
| * Doc: uiplugin in the qmake variable referenceLeena Miettinen2015-07-281-0/+4
| | | | | | | | | | | | Task-number: QTBUG-47180 Change-Id: Ia563445e36b0abb0ef7707e7a0e4241d70e60cfd Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | iOS: Refactor xcodebuild exclusive build logic into standalone makefileTor Arne Vestbø2015-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | Instead of going to qmake to generate the makefile that we want, we write the makefile directly and include it from the generated makefile. This leaves us with a single top level makefile for handling exclusive builds through xcodebuild, and covers all the various build configurations in a unified manner. It also allows for improved test device handling. Change-Id: I66851f181ac4da2c8938645e0aa95ffa0fee33c7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | Doc: remove the table of values from QT variable in QMake ManualLeena Miettinen2015-07-281-45/+3
| | | | | | | | | | | | | | | | | | | | Add a link to the topic that lists all Qt modules with links to their documentation. Change-Id: I0f488ea8c2f3479c7bace6ffbdbb7a70324c1649 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fixing Wec2013 qmake support for VS2013 SDKs.Björn Breitmeyer2015-07-211-6/+9
| | | | | | | | | | | | | | | | | | | | | | SDKs generated from VS2013 use a different folder for build settings than those generated from VS2012. Check both folders, before rejecting a potential SDK. Change-Id: I5bee5cc3771352adaab07d39ebbc350618f6c573 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | qmake: polish some function objectsMarc Mutz2015-07-081-3/+3
| | | | | | | | | | | | | | | | ... by marking the ctors (if any) explicit and the function-call operator const. Change-Id: Ia65fbad0dfdccbb31d630a5501c4d6f0f5aa3623 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | qmake: mark some types movableMarc Mutz2015-07-082-0/+2
| | | | | | | | | | | | | | They are already held in QVector. Change-Id: Ib1266956c860ecd4671501ab12ab932a8ce9b7d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-07-014-1/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
| * Replace MAC OS X with OS XNico Vertriest2015-06-301-1/+1
| | | | | | | | | | | | Task-number: QTBUG-46374 Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-272-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.h Manually fixed src/testlib/qtestcase.cpp to return the right type. Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4
| | * fix PCH related regression in vcxproj generatorJoerg Bornemann2015-06-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When PRECOMPILED_HEADER is set to foo/bar/stable.h and PRECOMPILED_SOURCE is empty, then a C++ file foo/bar/stable.cpp is generated that contains the include "stable.h". We must pass the exact string "stable.h" to the /Yc compile switch instead of "foo/bar/stable.h". Commit dc612acdc6577594c8f61345cea2de549d7aae34 introduced this regression to allow to have PRECOMPILED_SOURCE in a different directory than PRECOMPILED_HEADER. Change-Id: I1a7e096c0455b946a5660d23c70c72abd4c7ac1b Task-number: QTBUG-46679 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * pbuilder_pbx: disable bit code for Xcode projectsRichard Moe Gustavsen2015-06-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Xcode7, Apple added support for compiling apps to bit code instead of binary (*). But this is only supported when the deployment target is at least 6.0. And in Qt-5.5, the deployment target is still set to 5.1.1. The result is that every Qt application will fail building once people move to Xcode7. Instead of bumping the deployment target (which we plan to do for Qt-5.6), we choose to switch off bit code for now. *: https://developer.apple.com/library/prerelease/ios/documentation/IDEs/Conceptual/AppDistributionGuide/AppThinning/AppThinning.html Change-Id: I23001563439a7726506b7cd2dc77a82533b8a27b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * | allow running msvc2013 mkspecs from msvc2015 shellJochen Seemann2015-06-221-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | Visual Studio 2015 integrates the Windows Runtime development tools, including the msvc2013 compilers. This patch fixes the error that mspdb120.dll is missing. It is typically included through PATH variable of the shell, which points to the "wrong" location in this case. Change-Id: I46289721912d6b517c6083612582f67536d28b11 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-0316-79/+213
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into ↵Jani Heikkinen2015-06-021-1/+1
| |\ | | | | | | | | | refs/staging/5.5.0
| | * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-06-011-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/global/qglobal.h Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0
| | | * xcode generator: use absolute path when creating PBXFileReferences for librariesRichard Moe Gustavsen2015-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the Xcode generator uses "sourceTree = <absolute>" for all PBXFileReferences. But the paths we use for referencing libraries are relative. This patch will change this, so that we always use absolute paths to be consequent. This will fix a crash in Xcode that happens when opening projects generated by Qt. Change-Id: I3a372b93598a777c96ba353205cf19710a5923f5 Task-number: QTBUG-45966 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | | Merge 5.5 into 5.5.0Oswald Buddenhagen2015-06-016-11/+45
| |\| | | | | | | | | | | | | | Change-Id: I27921a25a0fc56afb5429e40fc1e9b4b9a645a9a
| | * | WinRT: Add qmake support for Windows 10Maurice Kalinowski2015-05-264-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows creation of applications for - x86 - x64 - arm While the arm build theoretically also allows to launch on a mobile, it currently asserts on runtime. Either we will create a new mkspec for Windows 10 Mobile in the future, or do runtime checks for the environment. That also depends on whether there will be a separate SDK by Microsoft. Change-Id: I510bfc88410a5b5a1eb7c37f7f43888d1e5dda0d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| | * | remove vestiges of -prebind magicOswald Buddenhagen2015-05-221-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since commit 22edeb3f4 (private; anno 2002), the generator would extract -prebind and translate it into a PREBINDING property in the pbx file. the writeout to the pbx file got lost in the rewrite for Xcode 3.2 (commit 66f6e5b1; anno 2012). this isn't particularly bad, as prebinding is obsolete since OS X 10.3.4. we now go the last mile and remove the handling of the flag. that means that remaining projects which still use it (meaninglessly) will get a warning from Xcode, which is kinda what we want. QMAKE_LFLAGS should have never been part of the library iteration loop. it was added there in the prebind handling commit, so we can get rid of it again now. Change-Id: Id7dee2b1e248bb2bd7aa7a3e66f82057921afffd Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| | * | fix quoting of qmake parameters in 'qmake' targetOswald Buddenhagen2015-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to do full shell quoting, not the limited whitespace quoting. Task-number: QTBUG-46224 Change-Id: I41bc9aee556ca680dce0875b58159a31db962452 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | don't process .prl files recursivelyOswald Buddenhagen2015-06-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are self-contained, as they are the result of another project's full resolution. consequently, recursing them just burns cycles, and additionally introduces the risk of an endless loop if the file is botched. Task-number: QTBUG-12711 Change-Id: I401ee691c170092cc61fe05538cec4272ed8f922 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | fix incorrect path separators coming from installed .prl filesOswald Buddenhagen2015-06-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we use qmake properties in the installed .prl files, so the paths need to be converted to native separators before emission. Task-number: QTBUG-46217 Change-Id: If3fb0a84488795478fc2a701271c931c62eba6aa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | fix installing unix dll symlinks on windows hostsOswald Buddenhagen2015-06-011-0/+71
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by implementing a fake ln in qmake. symlinks are supported only since vista (we officially still support xp), and even there are permission-restricted (MS being (rightfully) afraid of symlink attacks). so we fake the links by copying the files instead. the previous hack was a bit naive, simply using cp/copy instead of ln. this didn't work with relative paths, as real symlinks are resolved against their parent directory, not the working directory of the "ln" command. the new fake does this correctly. Change-Id: Ia2f5d68a39d6ffcc8a4383f9d0fc63a9da0a05c3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | move symlinking loop into the symlink container emptiness conditionalOswald Buddenhagen2015-05-201-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | it obviously makes no sense to set up the loop if the container is empty. as we now have that conditional anyway ... Change-Id: I6d95c0102734852443c188012bfcb076d879581e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | bundles: create Versions/Current only if versioned resources are presentOswald Buddenhagen2015-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMAKE_FRAMEWORK_VERSION has a fallback to VER_MAJ (which derives from VERSION), so it's pretty much always set, thus defeating the previous check. amends 6cb495de. Task-number: QTBUG-46215 Change-Id: I2c5560c469617ebeab978e4de78df00baf38d49d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | add qmake evaluator testOswald Buddenhagen2015-05-201-0/+1
| | | | | | | | | | | | | | | Change-Id: I31b95daede5edef245dd1ba447f2937a0db34232 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | move get{,Hash}Str from QMakeEvaluator to ProFileOswald Buddenhagen2015-05-204-28/+32
| | | | | | | | | | | | | | | | | | | | | this makes it possible to use these functions without an evaluator. Change-Id: I23e4ec141b427f4c3c8b647305532be179058c07 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | remove bogus parens from error messagesOswald Buddenhagen2015-05-201-2/+2
| | | | | | | | | | | | | | | Change-Id: I2683a4fb19a7251dc537e3265db3ba28079eb4b8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | trim whitespace from windows error messagesOswald Buddenhagen2015-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | the messages contain a trailing CRLF, which is not helpful. Change-Id: I4a27115a191dc416a62e28a41f2a9c5893bdc64b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | remove trailing dots from some error messagesOswald Buddenhagen2015-05-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | the i/o functions are not very consistent about having the dot already in the message. the windows api does, and qt passes this on. Change-Id: I2d1a213965e15478985d6eff205689ea44aa2a03 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | make defined() error message tell about "var" typeOswald Buddenhagen2015-05-201-1/+1
| | | | | | | | | | | | | | | Change-Id: I21d994ebaee2db0d9b114812a8f89bb680ca311e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | make infinite loop protection work even without an iterator variableOswald Buddenhagen2015-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | ... (which is the usual case). Change-Id: I464b6b284f963df45c7340ed079d540b528136f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | fix quote nesting in split_value_list()Oswald Buddenhagen2015-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | a single quote must not disrupt a double quoted string and vice-versa. Change-Id: Ibb277bc1c930a7dbe9199ca572507ababbcfae4c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | add autotest for ProStringOswald Buddenhagen2015-05-201-0/+12
| | | | | | | | | | | | | | | | | | | | | also adds documentation, which is kind of a sanity test. ehm. Change-Id: I6b520e8b505a2bfbb1e376fa72be0f140227a3a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | xcode generator: don't change output_dir when opening a pbx file directlyRichard Moe Gustavsen2015-05-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProjectBuilderMakefileGenerator::openOutput should only change back Option::output_dir when creating a pbx file inside an Xcode project. Since the pbx file will be placed inside a different directory than output_dir when creating an Xcode project, MakefileGenerator::openOutput() will redirect output_dir to be inside the Xcode project as well. Since we don't want this redirection, we change output_dir back to what it was once the call returns. But we should only do this when creating the whole Xcode project, since only then we create a pbx file that is different from output_dir in the first place. A bug with this is seen when making qt_makeqmake.mak (which is a helper makefile inside the Xcode project). That file will only regenerate the pbx file (and not the whole Xcode project), which means that we don't enter the fileName.isEmpty() section, which means that output_dir should stay as it is. Task-number: QTBUG-45826 Change-Id: I03d5c3dec395ff4768f9272fd1981c6fd35efb1e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * | fix wrong path separators in extra compiler commandsOswald Buddenhagen2015-05-081-1/+1
| | | | | | | | | | | | | | | Change-Id: I19a2c53c301becbbe5b70e47067f9a3355f7b04a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | fix (un-)installation for TEMPLATE = auxOswald Buddenhagen2015-05-082-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | don't try to install the primary target, as it obviously doesn't exist. however, we must not disarm bundle installation. Change-Id: I3074150f749220d77c1210a4978e71aff9c9a3a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | deprecate DEPLOYMENT variableJoerg Bornemann2015-06-024-50/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the qmake variable DEPLOYMENT that was used for installing files on remote devices for Windows RT and Windows CE Visual Studio projects. Use INSTALLS for both nmake and Visual Studio projects. [ChangeLog][core][qmake] Deprecated the qmake variable DEPLOYMENT in favor of INSTALLS. Task-number: QTBUG-21854 Change-Id: Ia9d2c69feb7d87b0b9dc69ff7c0a68be35a57acd Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Introduce qmake RC_DEFINES for RC preprocessor definesM. Moellney2015-06-025-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake win32 generators by default used values of DEFINES for RC preprocessor defines, too. For simple defines this works. For string literals this failed for the .vcxproj files: DEFINES += "FOO=\"BAR BAR\"" works for CL but fails for RC. DEFINES += "FOO=\\\"BAR BAR\\\"" works for RC but fails for CL. This patch introduces the qmake variable RC_DEFINES. The variable contains the preprocessor defines, that are used for RC. If the varible is not set, the DEFINES values are used for RC. Task-number: QTBUG-44184 Change-Id: I4202271759d29de8c1829347ae3ef117eda54b38 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | qmake: Place Info.plist in correct location for plugin bundlesTor Arne Vestbø2015-05-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Like application bundles on OSX, the plugin bundle has its Info.plist in the Contents directory. Change-Id: I216fa79857924beb0e9c5fcc4a8d06b197a3f383 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Deinline QRingBuffer classAlex Trotsenko2015-05-202-1/+6
|/ / | | | | | | | | | | | | | | 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>
* | make QMAKE_FRAMEWORK_VERSION work independently of TEMPLATEOswald Buddenhagen2015-04-271-7/+13
| | | | | | | | | | | | | | | | | | QMAKE_BUNDLE_DATA itself does as well, and it can refer to versioned resources. Change-Id: I3d9bf23c2ff81dbb1cd929f3f0e0ce1e67f3258a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | remove superfluous method re-implementationJoerg Bornemann2015-04-271-3/+1
| | | | | | | | | | | | | | | | | | | | Remove a superfluous implementation of VcprojGenerator::replaceExtraCompilerVariables. The implementation in the base class is exactly the same. Use that instead. Change-Id: Ie7d995be1b0d55fbefd15ae6b7a992237d97839c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | fix distclean targetsOswald Buddenhagen2015-04-232-1/+5
| | | | | | | | | | | | | | | | | | | | this makes the distclean targets work throughout qt. the dreaded confclean target is aliased to distclean. Task-number: QTBUG-8202 Task-number: QTBUG-20566 Change-Id: I7ac8e3b5b0110825dc93e4fa885281db91c6cf83 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | automatically distclean internally generated artifactsOswald Buddenhagen2015-04-232-3/+11
| | | | | | | | | | | | | | specifically, .prl, .pc, and .la files, and QMAKE_SUBSTITUTES outputs. Change-Id: I27685125668f0ec2aa81a8f003d3605accf2ab36 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | fix distclean target for plugins under unixOswald Buddenhagen2015-04-231-2/+2
| | | | | | | | | | Change-Id: I5ebaba8575dfac9597e1ead92d42955ff626e1b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | don't fail to fix path separators in extra compilers' clean targetsOswald Buddenhagen2015-04-231-2/+4
| | | | | | | | | | | | | | | | this affects only files explicitly listed via the .clean member without placeholders, so more or less a corner case. Change-Id: I7bd55948130aaee116d1a4bebbad0c445b76197b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | untangle handling extra compiler .clean member, take 2Oswald Buddenhagen2015-04-231-5/+4
| | | | | | | | | | | | | | | | | | | | fixes clean targets of (most) extra compilers being empty. amends commit 0812b5b3188. Task-number: QTBUG-45132 Change-Id: I069bca124587df261597a4f8183a4695cd834e29 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | fix {ALL,CLEAN,DISTCLEAN}_DEPS writeout to makefileOswald Buddenhagen2015-04-231-3/+3
| | | | | | | | | | | | | | | | it helps enormously to put spaces between target names ... Task-number: QTBUG-45533 Change-Id: Ic41f8287c6c37761b1be3ad7c383b5c7fb714b12 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>