summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-201-11/+8
|\ | | | | | | qtscript-jsc-backend
| * Make the license test pass.Frans Englich2009-08-191-11/+8
| | | | | | | | | | | | | | This is partly done to address a review comment for S60. Reviewed-by: Marius SO Reviewed-by: Paul
* | remove QtScript from includepathKent Hansen2009-08-194-4/+1
| | | | | | | | qmake no longer uses QtScript.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-191-1/+3
|\ \ | |/ | | | | qtscript-jsc-backend
| * Add support for LIBS_PRIVATE to the VCProject generator too.Thiago Macieira2009-08-181-1/+3
| | | | | | | | Reviewed-by: Marius Storm-Olsen
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-185-15/+15
|\ \ | |/ | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
| * CompileAnders Bakken2009-08-174-14/+14
| | | | | | | | | | | | | | After 843d2eed0ac10589a01d40bfdf88cb44c6a00b17 qmake didn't compile anymore. Reviewed-by: TrustMe
| * Rename qlistdata.cpp (back) to qlist.cpp.Volker Hilsheimer2009-08-171-1/+1
| | | | | | | | | | | | | | | | In the old days, some compilers would implicitly include the *.cpp file if the *.h file contained templates. That's why we had qlistdata.cpp not qlist.cpp. Those compilers are no longer supported. Rev-by: Harald Fernengel
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-178-13/+27
|\ \ | |/ | | | | qtscript-jsc-backend
| * Add LIBS_PRIVATE to qmake.Thiago Macieira2009-08-178-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | The difference between LIBS and LIBS_PRIVATE is that private libraries are those that are not part of the public interface of a library. For example, if you're writing a Qt application and link to QtGui, you definitely need the development files for QtCore, but not necessarily for Glib and GThread, or maybe even X11. The private libraries are necessary only in static builds, so the information should still be published in .prl and pkg-config files. Reviewed-By: Marius Storm-Olsen
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-141-1/+1
|\ \ | |/ | | | | qtscript-jsc-backend
| * 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
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-1240-40/+40
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: configure src/script/qscriptarray_p.h src/script/qscriptasm.cpp src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata.cpp src/script/qscriptclassdata_p.h src/script/qscriptclassinfo_p.h src/script/qscriptclasspropertyiterator_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptcontextinfo_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmaboolean_p.h src/script/qscriptecmacore.cpp src/script/qscriptecmacore_p.h src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptengineagent_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptextvariant_p.h src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptglobals_p.h src/script/qscriptmember_p.h src/script/qscriptnameid_p.h src/script/qscriptnodepool_p.h src/script/qscriptobject_p.h src/script/qscriptobjectfwd_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptsyntaxcheckresult_p.h src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvaluefwd_p.h src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptvalueiteratorimpl_p.h
| * 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/qt into ↵Kent Hansen2009-08-102-5/+16
|\ \ | |/ | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/script/api/qscriptable.cpp src/script/api/qscriptable_p.h src/script/qscriptclassdata.cpp
| * 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
* | remove final traces of qtscript from qmakeKent Hansen2009-08-064-148/+3
| |
* | merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-062-1/+4
|\ \ | |/ | | | | | | | | | | | | qtscript-jsc-backend Conflicts: tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * 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
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-07-305-22/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp src/script/qscriptbuffer_p.h src/script/qscriptclassinfo_p.h src/script/qscriptecmadate.cpp src/script/qscriptgc_p.h src/script/qscriptmemberfwd_p.h src/script/qscriptsyntaxcheckresult_p.h src/script/qscriptvalueimplfwd_p.h tests/auto/qscriptengine/tst_qscriptengine.cpp util/webkit/mkdist-webkit
| * 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 branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-289-48/+81
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/tools/qregexp.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
| * 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
* | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-144-53/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp src/script/qscriptecmafunction.cpp src/script/qscriptecmaglobal.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptenginefwd_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h tests/auto/qscriptqobject/tst_qscriptqobject.cpp
| * 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 branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-06-2940-80/+86
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptable.cpp src/script/api/qscriptclasspropertyiterator.cpp src/script/api/qscriptcontext.cpp src/script/api/qscriptengine.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptextensionplugin.cpp src/script/api/qscriptvalue.h src/script/api/qscriptvalueiterator.cpp src/script/parser/qscript.g src/script/parser/qscriptast.cpp src/script/parser/qscriptast_p.h src/script/parser/qscriptastvisitor_p.h src/script/parser/qscriptgrammar.cpp src/script/parser/qscriptgrammar_p.h src/script/parser/qscriptlexer.cpp src/script/parser/qscriptlexer_p.h src/script/parser/qscriptparser.cpp src/script/parser/qscriptparser_p.h src/script/parser/qscriptsyntaxchecker.cpp src/script/qscriptable.h src/script/qscriptable_p.h src/script/qscriptarray_p.h src/script/qscriptasm.cpp src/script/qscriptasm_p.h src/script/qscriptastfwd_p.h src/script/qscriptastvisitor.cpp src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclass.h src/script/qscriptclass_p.h src/script/qscriptclassdata.cpp src/script/qscriptclassdata_p.h src/script/qscriptclassinfo_p.h src/script/qscriptclasspropertyiterator.h src/script/qscriptclasspropertyiterator_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.h src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptcontextinfo.cpp src/script/qscriptcontextinfo.h src/script/qscriptcontextinfo_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmaboolean_p.h src/script/qscriptecmacore.cpp src/script/qscriptecmacore_p.h src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptengineagent.h src/script/qscriptengineagent_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextensioninterface.h src/script/qscriptextensionplugin.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptextvariant_p.h src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptglobals_p.h src/script/qscriptmember_p.h src/script/qscriptmemberfwd_p.h src/script/qscriptmemorypool_p.h src/script/qscriptnameid_p.h src/script/qscriptnodepool_p.h src/script/qscriptobject_p.h src/script/qscriptobjectdata_p.h src/script/qscriptobjectfwd_p.h src/script/qscriptrepository_p.h src/script/qscriptstring.cpp src/script/qscriptstring.h src/script/qscriptstring_p.h src/script/qscriptsyntaxchecker_p.h src/script/qscriptsyntaxcheckresult_p.h src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvaluefwd_p.h src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiterator.h src/script/qscriptvalueiterator_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptvalueiteratorimpl_p.h src/script/visitors/qscriptprettypretty.cpp src/script/visitors/qscriptprettypretty_p.h src/script/visitors/qscriptxmlgenerator.cpp src/script/visitors/qscriptxmlgenerator_p.h
| * | 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>
* | | Import JSC-based Qt Script from Kent's tree.Simon Hausmann2009-06-165-648/+5
|/ /
* | 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
generated by cgit v0.12 at 2024-10-20 08:54:30 (GMT)