summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Port of Qt to QNXHarald Fernengel2009-07-292-12/+10
| | | | | | | | This makes Qt work on QNX 6.4. * no q3support, no phonon * no QSharedMemory, no QSystemSemaphore, no QProcess Reviewed-By: Robert Griebl
* 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
* 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-011-36/+7
| | | | | | | 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-1629-58/+58
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1629-58/+58
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-122-9/+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 var->QMAKE_COMP_var docs, and mark feature unsupported.Marius Storm-Olsen2009-06-111-0/+1
| | | | | | | | Reviewed By: andy
* | 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 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
* | Merge branch '4.5'Thiago Macieira2009-05-141-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
* | Merge branch '4.5'Rhys Weatherley2009-04-211-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-024-16/+10
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * 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
| * Spring cleaning in qmake testsJoão Abecasis2009-04-022-4/+4
| | | | | | | | | | | | | | | | | | | | And some indentation fixes in qmake itself. Fixes indentation; TRUE => true; FALSE => false; #includes and #defines cleanup; removes dead code; comments... and somewhere along the way marked a function static. Reviewed-by: mariusSO
| * cosmetic bug in qmake msvc_nmake generator fixedJoerg Bornemann2009-04-021-3/+3
| | | | | | | | | | | | | | When generating nmake makefiles, the same inference rules were generated several times. Reviewed-by: mariusSO
* | Merge branch '4.5'Thiago Macieira2009-03-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
| * even more verbose debug outputOswald Buddenhagen2009-03-271-1/+1
| |
| * Long live Qt 4.5!Lars Knoll2009-03-2329-0/+19548
|
* Long live Qt!Lars Knoll2009-03-2329-0/+19549
generated by cgit v0.12 at 2024-12-04 00:36:25 (GMT)