summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-22/+25
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * fixify target source against build treeOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | | | | | | | | | that's where one would expect a target, after all. affects only extra targets explicitly requesting fixification, i.e., nothing. Reviewed-by: mariusSO
| * fix fixifying of QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-121-6/+10
| | | | | | | | | | | | | | use the correct bases. notably, don't expect the input file in the output dir. Reviewed-by: mariusSO
| * fix paths of vpath-resolved filesOswald Buddenhagen2011-04-121-4/+3
| | | | | | | | | | Task-number: QTBUG-8169 Reviewed-by: mariusSO
| * simplify: absolute fixification ignores the base dir argumentsOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | Reviewed-by: mariusSO
| * simplify: fileFixify for all same paths is always "."Oswald Buddenhagen2011-04-121-3/+1
| | | | | | | | | | | | this must have been the most arcane way to generate a single dot ever Reviewed-by: mariusSO
| * simplify: the input and output dirs are already normalizedOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | Reviewed-by: mariusSO
| * stop fixifying after first successOswald Buddenhagen2011-04-121-0/+1
| | | | | | | | | | | | | | somewhat unlikely that this had much real-world effects ... except eating yet more cpu. Reviewed-by: mariusSO
| * create a pwd string with a trailing slash only on demandOswald Buddenhagen2011-04-121-6/+7
| | | | | | | | Reviewed-by: mariusSO
| * useful location reporting for errors from QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | Reviewed-by: mariusSO
* | ReplaceExtraCompilerCacheKey: Don't recreate "::" QString on each call.Andreas Kling2011-03-231-2/+4
| | | | | | | | Reviewed-by: Marius Storm-Olsen
* | Don't cache resolved paths in MakefileGenerator::fileFixify().Andreas Kling2011-03-151-12/+0
| | | | | | | | | | | | | | | | | | | | | | The cache ends up dog-slow because of poor distribution in hashing of QStrings, and even with a better hashing function, computing the result on the fly is still faster. Tested with WebCore.pro, on Linux processing time goes from 58 to 8 seconds, and on Windows from 105 to 65 seconds. Reviewed-by: Marius Storm-Olsen
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | qmake: don't limit pkg-config writing to unix generatorMark Brand2011-01-101-0/+178
| | | | | | | | | | | | | | | | Move pkg-config related methods from unix generator to base class so they can be used by other generators too. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-1/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * fix error messages when configuring QtJoerg Bornemann2010-09-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit 019032c93b7397c7239ec99ec44b4923df31533b introduced a lot of annoying error messages when configuring Qt. It makes qmake complain that it cannot find rcc and uic, which aren't yet built at this point. We're now checking for the existence of the depend_command if it is given as absolute path. This is the case for uic and rcc. Yeah this is a weak solution for sick code. Task-number: QTBUG-13366 Reviewed-by: ossi
| * run depend_command even if the binary has no absolute pathOswald Buddenhagen2010-09-131-1/+1
| | | | | | | | | | | | | | this magic is a bit braindead anyway, but whatever. Reviewed-by: joerg Task-number: QTBUG-13366
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-9/+32
|\ \ | |/ | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * fix generated makefile dependenciesOswald Buddenhagen2010-08-261-2/+2
| | | | | | | | | | seems like some makes are rather lax about bogus dependencies, so this went unnoticed in local testing for at least two people.
| * add indirect input/output specification capability to QMAKE_SUBSTITUTESOswald Buddenhagen2010-08-231-7/+30
| | | | | | | | | | | | | | | | | | | | | | like in SUBDIRS, the specified strings can now be basenames of "structures" which specify the actual input and output files: QMAKE_SUBSTITUTES += test test.input = infile.txt.in test.output = foobar.out Reviewed-by: joerg
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-3/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * create missing output directories for substituted filesOswald Buddenhagen2010-08-181-0/+1
| | | | | | | | | | | | it wasn't the fault of fileFixify() after all ... Reviewed-by: joerg
| * fix QMAKE_SUBSTITUTES with shadow buildsOswald Buddenhagen2010-08-171-3/+3
| | | | | | | | | | | | | | | | | | | | still doesn't work for nested directories, but that's because fileFixify() is plain broken. on the way, remove a superfluous check: we know that the input file name ends with .in - three lines up we made sure it does. Reviewed-by: joerg
* | qmake: qmakeDeleteCacheClear() function can be template nowminiak2010-08-031-2/+2
|/ | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* run dep commands in build dirOswald Buddenhagen2010-07-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the file names are given relative to the build directory, so the command needs to be run in it as well. this is a more expected (and simpler) fix than the alternative, which would be giving file names relative to the source directory. reasons not to fix: - due to some other bug, the problem really affects only builds where the build dir is not at the same level as the source dir - otherwise, absolute paths would be passed anyway - it has some breakage potential for the cases where the commands actually expect being run in the source dir - it can be worked around by manually injecting the cd statement into the command reasons why i still fixed it: - it doesn't affect in-source builds, and it seems that most complex build systems (which would define custom compilers with depend_command) don't support shadow builds anyway - people who needed things to work probably already used $$OUT_PWD somehow (either a "cd" at the start, or prepending it to each path), so this change will be practically a no-op - "it's just dependencies, and these are known to be broken in qmake anyway" Reviewed-by: joerg Task-number: QTBUG-1918
* escape backslashes in QMAKE_PRL_LIBSOswald Buddenhagen2010-05-271-1/+1
| | | | | | they may contain (absolute) windows paths, which need escaping now. Reviewed-by: mauricek
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-191-3/+16
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-171-3/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: fix typo QCompleter: fix misuse of QMap that can lead to crashes qmake: added possibility to specify the type of an install target
| | * qmake: added possibility to specify the type of an install targetJoerg Bornemann2010-05-171-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change: target.CONFIG+=no_check_exist implies the file is a file, no way to make an install rule for a non-existing directory. Now, its possible to specify the type: target.CONFIG+=no_check_exist directory will install a directory. target.CONFIG+=no_check_exist executable will install an executable. target.CONFIG+=no_check_exist data will install a normal file. The default case, if no type is given, like in CONFIG+=no_check_exist will call QFileInfo::isExecutable() to determine, if its a data file or executable. This is the old behaviour. Task-number: QTBUG-10624 Reviewed-by: ossi
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * | fix path separators in install targets for MinGW+shJoerg Bornemann2010-05-141-1/+1
| |/ | | | | | | Reviewed-by: ossi
| * Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | | | | | | | | | | | | | | | This give the possibility to get the file name with the extension and without the path. Reviewed-by: Joao Reviewed-by: Marius Storm-Olsen
* | qmake: fix to create proper install target in Makefile at first runZeno Albisser2010-03-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Previously when qmake was executed the first time, or when no previously compiled binary target was available for some reason, qmake just created an empty install target in the Makefile. So in fact for a target to be installed properly you needed to run something like "qmake && make && qmake && make install". This should now be fixed with this patch. Reviewed-by: Marius Storm-Olsen Task-number:QTBUG-5558
* | don't have every generator duplicate the QMAKE_QMAKE logicOswald Buddenhagen2010-03-031-7/+5
| | | | | | | | Reviewed-by: mariusSO
* | decouple host platform mode from target platform modeOswald Buddenhagen2010-02-261-6/+8
| | | | | | | | | | | | | | | | | | | | | | derive the host mode from the generator - this doesn't work *too* well if the mode is different from the real host platform, so it's only for testing. get the target platform mode from the qmakespec, falling back to the host platform mode. Reviewed-by: mariusSO
* | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-121-14/+2
| | | | | | | | | | | | | | littering generic makefile generator code with it is both plain ugly and unnecessary. Reviewed-by: mariusSO
* | remove remainder of mac9 modeOswald Buddenhagen2010-02-121-3/+1
| | | | | | | | Reviewed-by: mariusSO
* | remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-121-2/+0
| | | | | | | | Reviewed-By: mariusSO
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-041-0/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * | Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | This give the possibility to get the file name with the extension and without the path. Reviewed-by: Joao Reviewed-by: Marius Storm-Olsen
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-1/+3
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * qmake: subdirs template: make distclean target use QMAKE_DISTCLEANOswald Buddenhagen2010-02-011-0/+1
| | | | | | | | | | | | patch by David Faure Reviewed-by: mariusSO
| * qmake: fix warningsOswald Buddenhagen2010-02-011-1/+2
| | | | | | | | | | | | missing braces, parens and spaces denoting empty loop bodies Reviewed-by: mariusSO
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-221-2/+8
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| * qmake: add Linux host support to Symbian generatorAnderson Lizardo2009-11-171-2/+8
| | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
* | Better fix for build!=src Makefile generationThomas Zander2010-01-141-5/+3
| | | | | | | | | | | | | | Make sure we always use the absolute path to the pro file so it will just work from either source or build dir. This fixes the usecase where qmake generated a relative path starting with '..'
* | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-131-8/+8
| | | | | | | | | | | | | | The code generated would always create the Makefile in the sourcedir, even if you had src!=build Reviewed-By: Thiago
* | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
|/ | | | Reviewed-by: Trust Me
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-09-27 13:14:17 (GMT)