summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-101-4/+9
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-101-1/+7
| |\
| * | 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
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-103-2/+11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * | 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
| * 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
| |
* | Fixed target name corruption in symmakeMiikka Heikkinen2009-08-071-3/+3
| |
* | Update license headers according to commit 858c70f768e.axis2009-08-0610-26/+26
| | | | | | | | RevBy: Trust me
* | Replaced $MODULE$ with hardcoded module names.axis2009-08-0610-10/+10
| | | | | | | | RevBy: Trust me
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-062-0/+2
|\ \
| * | Fix WebKit compilation outside of Qt with SBS.Simon Hausmann2009-08-061-0/+1
| | | | | | | | | | | | | | | | | | Propagate QMAKE_MOVE similar to commit 392ad41ba0c0d61d65e2c218ebf3b1a951a4c30a. Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * | Fix WebKit compilation outside of Qt.Simon Hausmann2009-08-061-0/+1
| | | | | | | | | | | | | | | | | | WebKit's .pro file uses shell commands that use QMAKE_MOVE/MOVE. The Symbian generator propagates DEL_FILE, but forgot to also propagate MOVE, like it is done for example in unixmake2.cpp.
* | | Removed some commented out code from qmakeMiikka Heikkinen2009-08-061-2/+0
| | |
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-0614-121/+107
|\ \ \ | |/ /
| * | Merge commit 'origin/master'Jason Barron2009-08-0416-285/+259
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * \ \ Merge commit 'qt/master-stable'Jason Barron2009-08-045-22/+12
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| | * | 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
| * | | 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>
* | | | Code style fixes to qmakeMiikka Heikkinen2009-08-067-270/+264
| | | |
* | | | Further cleanup of qmake codesMiikka Heikkinen2009-08-0615-233/+184
| |_|/ |/| |
* | | Whitespace, comment, and dead code cleanup for qmakeMiikka Heikkinen2009-08-0416-252/+176
| | |
* | | Removed unused method from SymbianMakefileGenerator.Janne Anttila2009-07-292-14/+0
| | | | | | | | | | | | | | | The getWithoutSpecialCharacters wasn't even in sync with similar removeSpecialCharacters method.
* | | Fixed some tab/space usage in symmake.cppJanne Anttila2009-07-291-20/+20
| | |
* | | Extended PKG customization possibilities via qmake.Janne Anttila2009-07-292-22/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 242139 This commit replaces Symbian specific 'depends' keyword in qmake DEPLOYMENT variable with two more generic ones. The new keywords are 'pkg_prerules' and 'pkg_postrules', and they allow developer to pass raw data to PKG file. The strings in 'pkg_prerules' are added before PKG file package-body headers and 'pkg_postrules' after them. Correspondingly as old 'depends' keyword, the new keywords are not parsed by qmake, so they must be in a format understood by Symbian package generation tools. Note that 'pkg_prerules' can also replace default language, package-header and vendor statements in pkg file. If you decide to override any of these statements, you need to pay attention that also other statements stay valid.
* | | Changed .pkg files to follow the naming scheme of make targets.Janne Anttila2009-07-281-2/+3
|/ / | | | | | | | | | | | | | | Task: 246499 QMake now generates the package files like deform_debug-gcce.pkg instead of deform_gcce_udeb.pkg. The new naming scheme is inline with make target which in this example was debug-gcce.
* | 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>
generated by cgit v0.12 at 2025-01-06 23:57:40 (GMT)