summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-08-141-1/+1
| | | | | | This matches the logic for the 'lib' template to the one for 'app'. Reviewed-by: Simon Hausmann
* Update contact URL in license headers.Jason McDonald2009-08-1240-40/+40
| | | | Reviewed-by: Trust Me
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-101-1/+7
|\
| * qmake - add error message if files for deployment are missingThomas Hartmann2009-08-071-1/+7
| | | | | | | | | | | | | | | | | | If files for deployment for windows ce are missing we get an error message now. Wilcards have to behandled special because QFileInfo::exists() does not work with wildcards. QFileInfo::absoluteFilePath() does work with wildcards Reviewed-by: Mauricek
* | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-101-4/+9
|/ | | | | | | | | | | | | | | | can not be found change that behavior to warn by default. Currently the default behavior of include() in a .pro file is not to warn if the supplied file argument can not be found which can lead to hard to find build errors. The include() will now,by default, warn if the specified file can not be found. If a warning is not required because the included file is optional then example use in the .pro file: include(SomePriFile.pri", "", true) Task-number:259398 Reviewed-by:Marius Storm-Olsen
* Add hints that a qmake generated .pro will need to be editedKeith Isdale2009-08-061-0/+3
| | | | | | | | | | When qmake run with the -project option to generate a .pro for the project it is possible that the generated .pro file will need to be edited and add variables such as "QT" to specify what QT modules the project needs. To hints to qmake's help and HTML documentation to that effect. Reviewed-by: Marius Storm-Olsen
* Replace instances of weak linking for 10.3 with 10.4.Morten Sorvig2009-08-061-1/+1
|
* Port of Qt to QNXHarald Fernengel2009-07-295-22/+12
| | | | | | | | This makes Qt work on QNX 6.4. * no q3support, no phonon * no QSharedMemory, no QSystemSemaphore, no QProcess Reviewed-By: Robert Griebl
* Fix qmake.pro so it can build qmake.Jason Barron2009-07-271-0/+1
| | | | | | | | qmake now uses a few of the files from the 'codecs' directory so add that directory to the VPATH directory such that building qmake using this .pro file is possible. Reviewed-by: TrustMe
* Fix qmake dependency generation for include statements with local files.Simon Hausmann2009-07-271-8/+6
| | | | | | | | The header file should be looked up relative to the directory of the compilation unit and not qmake's current directory or the like. Simplified the logic slightly to achieve that. Reviewed-by: João Abecasis <joao@abecasis.name>
* micro-optimization of some string operationsOswald Buddenhagen2009-07-171-18/+18
|
* some directory separator cleanupOswald Buddenhagen2009-07-172-15/+21
| | | | | | | | | | - don't duplicate slashes during path concatenation - always use forward slashes when dealing with Option::output_dir - rely on Option::output_dir being normalized at all times still a *very* long way to go, for which we have no time now. Reviewed-by: mariusSO
* Compile fix on windows.Denis Dzyubenko2009-07-163-6/+6
|
* Changed the implementation of the unicode text codecs to share more code ↵Denis Dzyubenko2009-07-165-1/+29
| | | | | | | | | | with qstring. The qstring unicode conversion functions used to have its own implementation, which did the same as QUtf*Codecs, so with the change all of them will share the same implementation. Reviewed-by: Thiago Macieira
* fix bug in qmake DEPLOYMENT variableJoerg Bornemann2009-07-131-2/+1
| | | | | | | | | | The documentation states "The default deployment target path for Windows CE is %CSIDL_PROGRAM_FILES%\target, which usually gets expanded to \Program Files\target." Now this statement is true. Task-number: 257053 Reviewed-by: mauricek
* qmake: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportMarius Storm-Olsen2009-07-013-49/+13
| | | | | | | Also, QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* Merge branch '4.5'Thiago Macieira2009-06-241-2/+7
|\ | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| * 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
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-1640-80/+86
|\|
| * 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>
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-123-17/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * 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
* | Remove var->QMAKE_COMP_var docs, and mark feature unsupported.Marius Storm-Olsen2009-06-111-0/+1
| | | | | | | | Reviewed By: andy
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-1/+1
|\| | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * link qmake without /DEBUG on WindowsJoerg Bornemann2009-06-051-1/+1
| | | | | | | | Reviewed-by: mariusSO
* | Made qmake handle "no_default" config for sub targetsJ-P Nurmi2009-06-051-1/+6
| | | | | | | | | | Merge-request: 395 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Merge commit 'origin/4.5'Olivier Goffart2009-06-041-1/+1
|\|
| * 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
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-021-1/+1
|\| | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tests/auto/selftests/expected_skip.txt tests/auto/selftests/tst_selftests.cpp
| * 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
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-1/+1
|\| | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * 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
* | less inefficientOswald Buddenhagen2009-05-181-1/+1
| |
* | Merge branch '4.5'Thiago Macieira2009-05-151-1/+1
|\| | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * 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
* | Remove unused file qfileinfo_p.hMarius Storm-Olsen2009-05-131-1/+0
| | | | | | | | | | | | | | The private class was already declared and defined in the qfileinfo.cpp file. Reviewed-by: thiago
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-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
* | Merge branch '4.5'Rhys Weatherley2009-04-221-3/+15
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * 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
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-072-3/+1
|\| | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
| * 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 ...
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-025-17/+11
|\| | | | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 03:37:29 +0000