summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-07-011-1/+3
|\
| * Merge branch 'warningRemovals'axis2009-06-301-1/+3
| |\
| | * Removed warnings on Symbian.axis2009-06-301-1/+3
| | | | | | | | | | | | | | | | | | | | | Library entries produce warnings if they are included in a project which has a static library target. RevBy: Miikka Heikkinen
* | | Added temporary include file generation to symbian-sbsv2 generatorMiikka Heikkinen2009-07-014-112/+105
|/ / | | | | | | and cleaned related functionality up a bit.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2940-99/+98
|\ \ | |/ |/| | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| * Do not crash qmake if MAKEFILE_GENERATOR is not defined in a loaded .pr* fileKeith Isdale2009-06-241-2/+7
| | | | | | | | | | | | | | | | If there is a issue loading the usual .pr* files do not crash qmake. Print out a useful warning if MAKEFILE_GENERATOR is not defined by a loaded .pr* file. Reviewed-by: mariusSO
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1640-80/+80
| | | | | | | | Reviewed-by: Trust Me
| * disable stdout buffering alltogetherOswald Buddenhagen2009-06-161-6/+3
| | | | | | | | | | | | | | | | having system-dependent bahavior is Not Nice (TM), and given that we do only printf()s of whole lines anyway, this should have no performance impact whatsoever. Reviewed-by: mariusSO
| * Fixes crash of qmake on Windows Vista Business x64 (and undefinedRohan McGovern2009-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | behavior on all versions of Windows). setvbuf handles its arguments differently on Unix and Windows. Windows uses the size parameter when the given buffer is NULL, which appears to violate C89/C99. Giving a size parameter of 0 with a NULL buffer caused qmake to crash on Windows Vista Business x64. Windows also can't set line buffering with setvbuf _at all_ according to the MSDN documentation, so don't bother calling it on Windows.
| * Force line buffering for stdout so it stays in sync better with stderr ↵audiofanatic2009-06-151-0/+7
| | | | | | | | | | | | | | | | (which is unbuffered) Task-number: 254786 Merge-request: 610 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * do not make PWD and OUT_PWD have trailing slashes upon returning from a ↵Oswald Buddenhagen2009-06-111-6/+5
| | | | | | | | | | | | | | | | SUBDIRS target they don't have initially, either. Reviewed-by: mariusSO
| * do not append trailing slash to OUT_PWD in nested pro-filesOswald Buddenhagen2009-06-111-2/+0
| | | | | | | | | | | | | | | | the top-level one doesn't have one, either, so this lead to inconsistent behavior depending on whether the pro was processed directly or from a SUBDIRS target. Reviewed-by: mariusSO
| * remove strange no-opOswald Buddenhagen2009-06-111-1/+0
| | | | | | | | Reviewed-by: mariusSO
| * remove dead codeOswald Buddenhagen2009-06-111-8/+0
| | | | | | | | | | | | seems it was never used since the initial checkin Reviewed-by: mariusSO
* | Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly forRohan McGovern2009-06-111-2/+10
| | | | | | | | | | | | SUBDIRS projects when using sbsv2. Acked-by: Miikka Heikkinen
* | Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly forRohan McGovern2009-06-113-46/+70
| | | | | | | | | | | | SUBDIRS projects when using abld. Acked-by: Miikka Heikkinen
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-082-2/+2
|\ \ | |/ | | | | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp
| * link qmake without /DEBUG on WindowsJoerg Bornemann2009-06-051-1/+1
| | | | | | | | Reviewed-by: mariusSO
| * Allow qmake to compile using it's .pro file.Jason Barron2009-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a problem where qmake would not compile when it was built from it's .pro file because this method uses the pre-compiled header. This header was causing a compile error in qlocale.cpp because qtextstream.h was included and this includes qlocale.h. The problem in qlocale.cpp was that it uses a define called QLOCALE_CPP to enable extra functions in the class declaration, but the pre-compiled header was preventing the qlocale.h from being re-processed and therefore the function was never compiled in. Reviewed-by: Marius Storm-Olsen
* | Make qmake compile from .pro on other platforms.Jason Barron2009-06-031-1/+6
| | | | | | | | | | | | | | The qpopen.cpp file is a workaround for the fact that the Metrowerks compiler that we are (ab)using to build Windows binaries is lacking a popen() function in the standard library. So only enable the workaround on the platform that needs it.
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-0310-10/+310
|\ \
| * \ Merge branch 'imSelections'axis2009-06-0310-10/+310
| |\ \
| | * | Fixed incorrect headers.axis2009-06-0310-10/+310
| | | |
* | | | Removed DEPENDS keyword from resource blocks of generated mmp files from ↵Miikka Heikkinen2009-06-031-2/+3
|/ / / | | | | | | | | | symbian-abld builds.
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-022-2/+2
|\ \ \
| * \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-022-2/+2
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
| | * Remove the fixFilename() usage from the solution generatorMarius Storm-Olsen2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the Solution Generator was using the fixFilename() function, so under some circumstances the solution filename wouldn't find the correct vcproj file to include. This created a problem with network-chat.vcproj. Task-number: 254772 Reviewed-by: joao
| | * Fixed qmake writing targets into the root of the current drive whenRohan McGovern2009-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DESTDIR=./ and using Windows, nmake and shadow builds. qmake would canonicalize the DESTDIR of "./" to "". Then it would check if the original DESTDIR ended with "/", and if so, append it to the new DESTDIR, resulting in a DESTDIR of "/" - the root of the current drive. Don't do that. This bug doesn't occur with in-source builds because qmake detects that the source and build directories are the same directory and replaces the DESTDIR of "./" with "" before it reaches the buggy code. Autotest: included Reviewed-by: Lincoln Ramsay
* | | Removed unused function from symmakeMiikka Heikkinen2009-06-022-4/+0
|/ /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-181-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/kernel/qcoreapplication.cpp Configure.exe not rebuilt because the changes are irrelevant for the S60 port. We'll rebuild it before merging back.
| * Use isNull() for strings instead of comparing against QString().Jesper Thomschütz2009-05-141-1/+1
| | | | | | | | | | | | foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network Reviewed-by: Samuel
* | Improved Linux compatibility for Symbian builds.Miikka Heikkinen2009-05-151-2/+7
| |
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-061-1/+1
|\ \
| * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-061-1/+1
| |\ \ | | |/
| | * Changed include file name to lowercase to be able to crosscompile win32-g++ ↵Denis Dzyubenko2009-04-281-1/+1
| | | | | | | | | | | | | | | | | | version from a Linux machine. Reviewed-by: trustme
* | | Added VERSION keyword generation to mmp filesMiikka Heikkinen2009-05-062-0/+42
|/ /
* | Fixed symbian-sbsv2 ICON keyword so that it will generate iconsMiikka Heikkinen2009-04-301-0/+1
| | | | | | | | compatible with older devices (S60 3.1 and up).
* | Changed generated file headers to have timestamp in ISO format insteadMiikka Heikkinen2009-04-282-8/+8
| | | | | | | | of localized format.
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-281-1/+1
|\ \
| * | Removed preserving read-only flag from winscw deployed files to makeMiikka Heikkinen2009-04-281-1/+1
| | | | | | | | | | | | functionality similar to hw deployment.
* | | Re-enabled winscw target for non-OS_WIN builds.Miikka Heikkinen2009-04-281-6/+4
|/ /
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-2710-27/+32
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-04-271-1/+1
| |\ \
| * | | Fixed compilation of qmake on MSVC6.axis2009-04-273-3/+3
| | | |
| * | | Fixed a few typos in qmake makefile for win32.axis2009-04-271-1/+2
| | | |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-277-24/+28
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
| | * | Missing debug .rc file with a clean shadow buildLincoln Ramsay2009-04-211-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating Windows Makefiles, qmake writes out a .rc file for each of debug and release (unless you've limited to just one build type). When doing a clean shadow build, the first .rc file is written into a directory that does not exist but the code was not handling the error case. The fix does 2 things. 1) Attempt to create the destination directory if we can't write the file. 2) Die with an error if we still can't write the file after doing #1. Reviewed-by: Marius Storm-Olsen
| | * | qmake: additional compiler options were written twice into vcproj filesJoerg Bornemann2009-04-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the function initCompilerTool we handled QMAKE_CXXFLAGS twice for every configuration (debug / release). The call of parseOptions before the if clause is enough. Reviewed-by: mariusSO
| | * | fix QMAKE_VAR_FIRST_ expansion in compiler flagsOswald Buddenhagen2009-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | doesn't seem to be a terribly popular feature, given that nobody noticed this yet ...
| | * | Small changes in qmake's fileFixifyJoão Abecasis2009-04-021-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed dead code and simplified conditionals. This should not otherwise change behavior or output of qmake in any way. Reviewed-by: mariusSO
generated by cgit v0.12 at 2024-11-15 07:11:37 (GMT)