summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
...
* | | search for default spec just like for other onesOswald Buddenhagen2012-03-021-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that way qtbase will find its spec without hacking .qmake.cache. note that passing "-spec default" on the command line would have already triggered the normal path, so artificial limitation did not even provide safety against abuse (it is arguably pointless/counterproductive for other projects than qtbase to have a default spec). Change-Id: Ib0c3e6498fd70cd6f9561951d72a47165878bb33 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | remove some bogus include locationsOswald Buddenhagen2012-03-013-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | nothing to be found in <sourcedir>/include. neither in <builddir>/src/corelib/xml. Change-Id: I381391a64542dc2ac7b421b6646c60a1b7a14639 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | use VPATH to locate sourcesOswald Buddenhagen2012-03-011-223/+11
| | | | | | | | | | | | | | | | | | | | | makes the file a "tad" more concise Change-Id: I81d9721942890659ac93b32f5988f9c005c88e87 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | merge Makefile.win32-g++{,-sh}Oswald Buddenhagen2012-03-012-348/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | the only difference is in the copy & del commands. the msys tools are tolerant about windows paths, so this just works. the in-makefile variant detection is stolen from tools/configure/. Change-Id: Ia283c1fe2e2aaa8cd5b1dfd7ae29244115f07d65 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | cosmetics: remove redundant conditional, add a comment & reshuffle codeOswald Buddenhagen2012-03-011-4/+6
| | | | | | | | | | | | | | | | | | Change-Id: I71c7e18db63f3581b8c818ad178aeb4f6ccf9446 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | look for features relative to spec only in advertized placeOswald Buddenhagen2012-03-011-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | that is, spec/../features/ (i.e., mkspecs/features/) - and not any directory up to the root. Change-Id: Ie5fdf2898fba5ac93583571edc24629471604798 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | make default_pro.prf advertize dynamically created .qmake.cacheOswald Buddenhagen2012-03-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moving the detection of .qmake.cache to the qmake startup had the side effect that a suddenly popping up cache would not be picked up by nested projects any more. this is not supposed to work in the first place, but the syncqt hack for building against non-installed modules relies on it. until we have cleaned that up properly, we need a way to notify qmake about the appearance of the cache file. Change-Id: I450646b936e3bb2ef2ed3aba05df58e521ccdc61 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | Add support for XCode 4 into qmakeAndy Shaw2012-03-011-71/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for XCode 4 into qmake and also indirectly fixes a couple of problems that are relevant for XCode 3.2 too Task-number: QTBUG-17247 Change-Id: I722470ad1854bd740cbbd28ff4956057a0e1906b Reviewed-by: David Forstenlechner <dforsten@gmail.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> (cherry picked from commit b5871311457ca97816c0abbb8b935570bbfb657c) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Implement missing replacements when installing .pc files for win32Hib Eris2012-02-291-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements replacements for win32 makefile generators similar to the replacement functionality in unix makefile generators. To enable Makefile code generation for replacements in win32 makefile generators, you must set QMAKE_STREAM_EDITOR to e.g. sed. When building for win32, sed is normally only available in the mingw/msys build environment and when cross compiling on unix. In these cases QMAKE_STREAM_EDITOR is set to sed in qmake.conf. For other win32 build environments QMAKE_STREAM_EDITOR is not set in qmake.conf and the replacements Makefile code is not generated. Change-Id: Ie5de5d517eafaeaa2544f1e972aec3fe11d0a6f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | look for mkspecs in the project root, not next to every projectOswald Buddenhagen2012-02-294-9/+36
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake would look for mkspecs/ in the directory containing the current project file. this makes completely no sense with recursive projects: a) nobody would make per-project specs and b) specs meant to be global would not be found. consequently, we look for a project root when starting qmake and use only that directory. if .qmake.cache is found/set, we assume that to be the project root. otherwise, we search for mkspecs/ the same way we search for the cache - just to up until we find one or hit the root. if we are shadow-building, search the build dir as well. Change-Id: Ie66b189a40c21203d956e681cbef44a89f98cd17 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | resolve relative spec paths already on the command lineOswald Buddenhagen2012-02-281-1/+9
| | | | | | | | | | | | | | this is way more predictable than resolving it later. Change-Id: I0ce27977b795bde9235e1d51d6f2d0d917f2398c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | move .qmake.cache search to OptionOswald Buddenhagen2012-02-284-29/+39
| | | | | | | | | | | | | | | | this is a one-time operation which depends only on the invocation, so this new home is much more appropriate. Change-Id: I11ef30a8227afed06e58e64e65809dba25e81567 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | don't look for features in PrefixPathOswald Buddenhagen2012-02-281-4/+0
| | | | | | | | | | | | | | | | | | it's generally redundant with DataPath which we already look into. this is consistent with where mkspecs are looked for. i don't think anyone will notice this "loss" ... Change-Id: Iab7c35cc22ba53e1005f26b5d85d41cf4dafad07 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | scope context saving more minimallyOswald Buddenhagen2012-02-281-6/+6
| | | | | | | | | | | | | | | | | | no point in saving the context when we are not actually modifying the current context. Change-Id: Id6f51a163e86bdf402aa0713737b655db68e7ee8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | don't generate bogus TARGETsOswald Buddenhagen2012-02-271-6/+6
| | | | | | | | | | Change-Id: Ia99cd8862157e5630506d02b3c7e9b35d4bc3302 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | remove fallback re-initialization of TARGET after parsing projectOswald Buddenhagen2012-02-261-3/+0
| | | | | | | | | | | | | | | | we already initialize it before parsing a project. if a project is daft enough to clear TARGET, it does not deserve differently than breaking. Change-Id: I6c727bc27d72a00e84b676ae3c169024bdb2d929 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Add TARGET_VERSION_EXT to pkgConfiglibNameHib Eris2012-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libName that is used in pkgConfig files should include the TARGET_VERSION_EXT. This is needed because in Win32MakefileGenerator::fixTargetExt(), the TARGET_VERSION_EXT is added to the library name. In Win32MakefileGenerator::processVars(), if TARGET_VERSION_EXT is empty, it is set to VER_MAJ. On platforms != Windows, TARGET_VERSION_EXT does not seem to be used. We probably got away with this so far because pkgconfig files generation for win32 was just added in 4.8 and nobody uses them yet, and because on platforms != windows the TARGET_VERSION_EXT is not used. Change-Id: I56f239e389f0ef926030e4c2376cadd92c4f673c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Create target pkgconfig dir in qmake generated Windows MakefilesHib Eris2012-02-241-0/+6
| | | | | | | | | | Change-Id: Icea70987ee3c6040ca3ba278a578849cb74156f4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fixed resolution of QMAKESPEC on Windows.Rohan McGovern2012-02-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | base_vars["QMAKESPEC_ORIGINAL"] is not guaranteed to be set the first time resolveSpec is called, since an include() can wipe it out. Change it so that resolveSpec is called repeatedly until some QMAKESPEC_ORIGINAL is set. The code which attempted to remove all of the path up to the last / was incorrect and must have been dead code (or its wrongness didn't matter) until now. Change-Id: I2b31ae10fc284ac7293c3cd95e5a2fd503ca7ab0 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | Revert "Escape project file name in makefile rebuild rules."Andreas Hartmetz2012-02-231-4/+4
|/ | | | | | | | | | It was the result of miscoordination between Andreas Holzammer and me, duplicating the functional change of commit ea2c9f764fed654a57972223449f41e208e05863. This reverts commit 8b7a9b4898c85e81d87cf642ec59ce85e917ee35. Change-Id: I9a47746c1c12ca00b2dc5c5d50e99f9bf990e3f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Drop file-engine abstraction from public APIJoão Abecasis2012-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This abstraction imposed serious performance penalties and is being dropped from the public API. In particular, by allowing file names to be arbitrarily hijacked by different file engines, and requiring engines to be instantiated in order to decide, it imposed unnecessary overhead on all file operations. Another flaw in the design with direct impact on performance is how engines have no way to provide (or retain) additional information obtained when querying the filesystem. In many places this has meant repeated operations on the file system, where useful information is immediately discarded to be queried again subsequently. For Qt 4.8 a major refactoring of the code base took place to allow bypassing the file-engine abstraction in select places, with considerable performance gains observed. In Qt 5 it is expected we'll be able to take this further, reaping even more benefits, but the abstraction has to go. [Dropping this now does not preclude that virtual file systems make an appearance in Qt at a later point in Qt 5's lifecycle. Hopefully with a new and improved abstraction.] Forward declarations for QFileExtension(Result) were dropped, as the classes were never used or defined. Tests using "internalized" classes will only fully run on developer builds. QFSFileEngine was removed altogether from exception safety test, as it isn't its intent to test internal API. Change-Id: Ie910e6c2628be202ea9e05366b091d6d529b246b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* make resolution of default spec less inefficientOswald Buddenhagen2012-02-212-35/+29
| | | | | | | resolve only once, in particular on unix. Change-Id: I090698fc6029322a3a16d179d461af3e8336f6ad Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* remove bizarre late feeding of user_configs into base_varsOswald Buddenhagen2012-02-211-7/+0
| | | | | | | | there is no obvious reason why this should happen. if base_vars is used again, the user configs will be parsed again, too. Change-Id: Ib56e01a468cdb5e81d610bcaf0163bf730cbae05 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Implement QMAKE_SUBSTITUTES.config = verbatim.Stephen Kelly2012-02-111-49/+61
| | | | | Change-Id: Ie0b333fa7fae2283e99e42f9cd7bab4e84991f40 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Escape project file name in makefile rebuild rules.Andreas Holzammer2012-02-111-4/+4
| | | | | Change-Id: I5407c2477613119b5aea2d00eb88cc24d35788ad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* lower qmake optimization level on msvcOswald Buddenhagen2012-02-101-1/+1
| | | | | | | | | -O2 triggers an optimizer bug where compiling unixmake*.cpp would take several minutes each. -O1 is not measurably slower, so use that instead. Change-Id: Ibf8abbecdd69e35cef800841f781543121168f76 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Escape Dependencies of precompiled header right.Andreas Holzammer2012-02-101-1/+1
| | | | | Change-Id: I847c85250b78a934bd29e09250d209d9ef412f7f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* consolidate Read* optionsOswald Buddenhagen2012-02-092-9/+8
| | | | | | | | this brings some clarity which combinations are actually possible, which allows for some optimization later on. Change-Id: I930027e426c5f9abea8d21eb1ebaa39bd29787b8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Allow customization of qDebug output at runtimeKai Koehne2012-02-095-6/+18
| | | | | | | | | | | | | Check the QT_OUTPUT_PATTERN environment variable in the default message handler to customize the output of messages. Following place holders are right now supported: %{message}, %{type}, %{file}, %{line}, %{function} The original cleanupFuncinfo was written by Thiago Macieira. Change-Id: I6ad25baaa0e6a1c9f886105d2a93ef3310e512a9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: David Faure <faure@kde.org>
* Fix qmake evaluation of QMAKE_TARGET.arch on msvc2010 x86_64Giotis Nikos2012-02-081-2/+8
| | | | | | | | | | | | | This change is needed because msvc2010 tools have a '\' character at the end of environment variable VCINSTALLDIR. This variable on msvc2008 does not have this '\' character at its end. Without this change QMAKE_TARGET.arch on msvc2010 x64 evaluates to x86 instead of x86_64. Task-number: QTBUG-22686 Change-Id: Ifba833e9361c97568b8b3de9976023e8537b208a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qmake: Work around MSVC compiler bug.Friedemann Kleint2012-02-051-0/+14
| | | | | | | | Disable optimization for getProjectUUID() as it triggers ASSERT: "&other != this" at qstring.h:720 with -O2. Change-Id: I51b31d4318ba9be187c186623099171d8f48235b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Escape path names in qmake-generated Makefiles.Andreas Hartmetz2012-01-311-1/+1
| | | | | | | | | | | qmake-generated Makefiles since 4.6 (according to bug report) contain recursive qmake invocations with absolute paths to .pro files, where the absolute paths are not escaped. Task-number: QTBUG-11776 Change-Id: I49772c7d9147efea3bb7b9623c61d92aa0bb6857 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3044-44/+44
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* "cache" is used only locally, so move it into scopeOswald Buddenhagen2012-01-272-1/+2
| | | | | | | Change-Id: I0ba45d5620a8e5a79fdc6a1854245a0bfcc489f0 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-2344-44/+44
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qmake: Normalize paths instead of converting to native separatorsOrgad Shaneh2012-01-195-68/+89
| | | | | | | Task-number: QTBUG-22738 Change-Id: I40163a883d84beff79f52bff141d61dfe921c129 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake wasn't handling spaces in names when dealing with extra installs.Kurt Korbatits2012-01-141-8/+8
| | | | | | | | | | | When installing extra binaries the paths where not being escaped, causing stripping and deleting to fail when dealing with filenames that contained one or more spaces. Change-Id: Iba4517b1110f6af30f7e2662cb86024a8b7b81f7 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QMap => QHashOswald Buddenhagen2012-01-1013-121/+119
| | | | | | | | | | | | this should make the evaluator quite a lot faster. the total win for qtbase/src is only 6%, though. i made some effort to avoid that output files get randomized. however, i didn't bother to keep debug output sorted. Change-Id: Id9cef4674c0153c11ebbb65cb63bf8c229eb56e3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: fix default value for C++ optimization in vcxproj filesJoerg Bornemann2012-01-082-2/+8
| | | | | | | | | For the debug configuration the optimization should be turned off. Task-number: QTBUG-23421 Change-Id: Ib63e0c51f9ab31180ff8ee01a1f6c57ab77e390e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: fix /MP option for VS 2010Joerg Bornemann2012-01-081-3/+3
| | | | | | | | | Setting QMAKE_CFLAGS+=/MP in a project file did not work for VS 2010. Task-number: QTBUG-23490 Change-Id: I39c349bf8dc2a4add2f32a430a245a20cc54147e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make QUuid a class.Friedemann Kleint2012-01-061-1/+1
| | | | | | | | Silence MSVC warnings about forward-declarations as class in the metatype system. Change-Id: I676662e5919585e98c87413fd8360d6f41f73631 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0544-44/+44
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove unused -DQT_NO_PCRE from qmake makefilesGiuseppe D'Angelo2011-12-234-4/+3
| | | | | | | | That define is not used anymore when building qmake. Change-Id: I6a478cf4bb6cc8dfe87a3cc96f1d520b08e4ba6f Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qmake: Add object_parallel_to_source config optionTor Arne Vestbø2011-12-071-0/+23
| | | | | | | | | | | | | | | | | | | This solves the problem of two source files in the same project having the same name, which ends up with colliding object files. It also solves issues with moving files around in the source tree when the GNUmake option is used together with gcc_MD_depends, where the dependency file would end up with a dependency to the old source location. We already have object_with_source option, but that does not play nicely with shadow-builds. The new option tries to keep the same hirarcy in the output dir (while still respecting OBJECTS_DIR), as the sources. Any source with a path outside of the root project directory (absolute or relative, ../../foo.cpp), will be put inside the objects directory with the full path appended. Change-Id: I0c96291974f4801f4c55a26485d512b15c144c00 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* qmake: Don't assume that GNUmake is able to resolve arbitrary dependenciesTor Arne Vestbø2011-11-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | Extra compilers may define a depend_command that's used to generate dependencies for each input. When GNUmake was enabled we failed to run this command, which was affecting resource files, as resource dependencies are handled by an extra compiler defined in resources.prf. The result was that changes to resources included in a resources-file did not trigger a re-run of qrc and subsequent recompile of the resource object file. We must always run these custom dependency commands, even when GNUmake (and the extended gcc_MD_depends option) is enabled, as GCC is only able to handle regular #include-type dependencies. Hence, the check for the 'include_deps' flag was removed from doDepends(), and the check for GNUmake was moved to the one place where it still made sense -- when deciding whether or not to do recursive dependency checking. Change-Id: I5ddb75c873120c90f798808efc52e81500786301 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* qmake: Allow extra compilers to have the makefile depend on its inputsTor Arne Vestbø2011-11-282-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And enable this configuration option for the resource compiler. This results in a re-run of qmake whenever you touch a qrc file, which is needed to keep the dependencies up to date. Otherwise you might end up in the situation where you add a file to a qrc, edit the file some time later, but a rebuild does not regenerate a cpp file and compile that, so the final binary is stale. Technically this dependency problem is present for all source files, and qrc files are no different than any cpp file that you add a new header #include to, or adding a Q_OBJECT macro to a header. To pick up these changes we have to re-run qmake, so that qmake can run its internal dependency checking, and any extra compiler dependency commands. The reason we're making this change for rcc files it that conceptually people treat them as a "project" files, and expect them to behave similarly to .pro or .pri files, in that editing the file will invalidate the makefile. In practice this is often what happens when adding new headers, as you touch the project file when changing the HEADERS variable. Task-number: QTBUG-13334 Change-Id: If69149678e7fba6d812d31dcc17877427f9a6122 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Added build system support for installing tests.Rohan McGovern2011-11-232-1/+5
| | | | | | | | | | | | | Tests will install under $$[QT_INSTALL_TESTS]. TESTDATA may be used to install additional testdata required by the test. The default install rule may be disabled by CONFIG+=no_testcase_installs. Change-Id: I204de60c8e844775906ffd016ca50bffbb414142 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add -nn for .cpp MOC preprocessing for INTEGRITYRolland Dudemaine2011-11-181-0/+1
| | | | | | | | | | | | | | | qmake generates .gpj project files for INTEGRITY. Calls to moc on headers or code that do not produce actual output cause a Note to be generated. This is considered as an error during build by the Green Hills gbuild build tool. -nn can be added to not generate that note when no output is generated. This was already done for headers in util/integrity/qt.bod, but it was not there yet for .cpp files. Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 480b2f4c79160afaac7934936d3ae6ea382ae2bb) Change-Id: I480b2f4c79160afaac7934936d3ae6ea382ae2bb
* Remove commented out code.Rolland Dudemaine2011-11-181-7/+0
| | | | | | | Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit c37ba1319c5789b82e14b84e9bc85ceff7cc6b5e) Change-Id: Ic37ba1319c5789b82e14b84e9bc85ceff7cc6b5e
* Windows: Adapt mkspec for MinGW / gcc 4.6.Friedemann Kleint2011-11-182-2/+2
| | | | | | | | | | | gcc 4.6 becomes the minimum required version in Qt 5. See also d4150975af620e2889cc58bd476bac6b4d101db3 in Qt 4.8. Change-Id: If66ce0be755263c20b0a4371523c6590592d962d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 11:42:09 +0000