summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-07-292-8/+7
|\
| * 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>
* | Merge commit 'qt/master-stable'Jason Barron2009-07-2710-91/+88
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * 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>
* | Made deployment paths with drive letters work.axis2009-07-131-1/+5
| |
* | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-094-113/+108
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * \ 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
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3040-82/+93
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | | 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 'qt/master-stable' into 4.6-stableJason Barron2009-06-256-22/+16
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | 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
| * | 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
| |\ \
| * \ \ 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
| * \ \ \ 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
| * | | | | less inefficientOswald Buddenhagen2009-05-181-1/+1
| | | | | |
| * | | | | Merge branch '4.5'Thiago Macieira2009-05-141-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * | | | | | 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-025-17/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * \ \ \ \ \ \ \ \ \ 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
| * | | | | | | | | | | Long live Qt!Lars Knoll2009-03-2347-0/+27151
| / / / / / / / / / /
* | | | | | | | | | | 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
generated by cgit v0.12 at 2024-12-27 22:31:48 (GMT)