summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-31104-1352/+1352
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp 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/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/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-31104-1352/+1352
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' into 4.6Janne Anttila2009-08-282-0/+43
|\ \
| * | Changed createpackage parameters to be more consistent with make targets.Janne Anttila2009-08-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier createpackage required two separate parameters to define the platform and target. For example > createpackage fluidlauncher_template.pkg release armv5 Now it is changed to: > createpackage fluidlauncher_template.pkg release-armv5 This is consistent to make target what is used to do the building i.e.: > make release-armv5 The change also affected environment variables supported by 'make sisx' target. QT_SISX_PLATFORM is not any more supported, and the info is merged QT_SISX_TARGET variable. Reviewed-by: Miikka Heikkinen
| * | Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The included fixes / cleanups: - QtLibs PKG filename changed - Component name in Qt libs pkg changed to "Qt for S60" * Done in order to make SISX upgrade possible after pre-release. - Removed passing of 'fixedTarget' member variable as an argument - Removed whitespaces from generated file names - Fixed 'make sisx' calling syntax when custom makefile name used - Fixed MAKEFILE variable content in generated makefiles - Changed names of environment variables used by 'make sisx' * Nee variables have 'QT_SISX_' prefix Reviewed-By: Miikka Heikkinen
| * | Added support for 'make sisx' target in Symbian OS.Janne Anttila2009-08-272-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f189e00 added support for template PKG file. This commit extends the template PKG file usage with new make target, i.e. the commit adds a new make target called sisx, which can be used to generate signed sisx files. The sisx target is basically wrapper for calling createpackage.bat, but it also adds support for default platform/target and environment variables. Default platform/target feature means that SIS packages are automatically created for last build target. For example: >qmake >make release-armv5 >make sisx <- Creates sisx for release-armv5 It is also possible to override the platform and target for which the SISX is created as follows: >qmake >make release-armv5 debug-winscw >make sisx PLATFORM=ARMV5 TARGET=UREL <- Creates sisx for release-armv5 Since PLATFORM and TARGET are make variables they can also be defined as an environment variables instead of passing them for make. I.e. the following is indentical to previous example: >set PLATFORM=ARMV5 >set TARGET=UREL >qmake >make release-armv5 debug-winscw >make sisx <- Creates sisx for release-armv5 The environment variables are also useful if you have your own developer certificate what you want to use for signing SIS files. For example: >set CERTIFICATE=mycert.cer >set KEY=mykey.key >qmake >make release-armv5 >make sisx The above example creates release-armv5 SIS package with custom certificate and key (key without password). If certificate and key are not defined, the same logic as in old createpackage.bat will be used i.e. if RD cert is available in Qt root it will be used, and if not self-signed cerfificate will be used. The environment variables supported by 'make sisx' are: PLATFORM TARGET CERTIFICATE KEY PASSPHRASE The createpackage.bat can still be called directly but preferred way is to use new make target directly as examples above demonstrated. Task: 259037 RevBy: Miikka Heikkinen
* | | Merge branch '4.5' into 4.6Thiago Macieira2009-08-281-0/+41
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/opengles2/opengles2.cpp tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/windowsmobile/test/ddhelper.cpp tests/auto/windowsmobile/testQMenuBar/main.cpp tests/auto/xmlpatternsxqts/lib/ASTItem.cpp tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp tests/auto/xmlpatternsxqts/lib/Global.cpp tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp tests/auto/xmlpatternsxqts/lib/TestCase.cpp tests/auto/xmlpatternsxqts/lib/TestContainer.cpp tests/auto/xmlpatternsxqts/lib/TestGroup.cpp tests/auto/xmlpatternsxqts/lib/TestResult.cpp tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp tests/auto/xmlpatternsxqts/lib/TestSuite.cpp tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp tests/auto/xmlpatternsxqts/lib/TreeItem.cpp tests/auto/xmlpatternsxqts/lib/TreeModel.cpp tests/auto/xmlpatternsxqts/lib/Worker.cpp tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp tools/linguist/tests/data/main.cpp tools/linguist/tests/tst_linguist.cpp tools/linguist/tests/tst_lupdate.cpp tools/linguist/tests/tst_simtexth.cpp util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp util/qlalr/examples/lambda/main.cpp util/qlalr/examples/qparser/qparser.cpp
| * | Add missing license headers.Jason McDonald2009-08-284-0/+164
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Update license headers.Jason McDonald2009-08-11100-100/+100
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fix compilation of webkit with mingwThierry Bastian2009-08-031-3/+0
| | |
* | | Fix some missing and duplicated license headers.Jason McDonald2009-08-273-0/+123
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-241-1/+1
| |/ |/| | | | | | | | | | | | | | | | | This introduces a QAbstractVideoSurface interface for implementing arbitrary video outputs, and a QVideoFrame type. Also included is the QVideoSurfaceFormat class which is used to configure the input to a video surface, and the QAbstractVideoBuffer class which allows QVideoFrames to be constructed from non-native frame types. Reviewed-by: Dmytro Poplavskiy
* | Merge commit 'origin/master' into symbolVisibilityIain2009-08-212-7/+6
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-211-5/+4
| |\ \
| | * | Updated flawed comment after 5365c1cdJanne Anttila2009-08-211-5/+4
| | | | | | | | | | | | | | | | Reviewed-by: Miikka Heikkinen
| * | | Merge commit 'qt/master'Jason Barron2009-08-211-1/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| | * | make Qt Designer compile when Qt is configured with -no-scriptKent Hansen2009-08-191-1/+2
| | | |
| * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-214-8/+12
| |\ \ \
| * | | | Revert "Hackish workaroung to Open C / C++ defect when intermixing standard"Janne Anttila2009-08-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4dd03abdfbcc1af3075b30165e19ee63fe8051f4. And changes stl.prf slightly to get the Qt libs compiled again without reverted hack. Conflicts: src/gui/painting/qblackraster.c
* | | | | Merge commit 'origin/master' into symbolVisibilityIain2009-08-209-14/+18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Changed a define to comply to Qt naming conventions.Miikka Heikkinen2009-08-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepended QT_ to a define we use internally in fixed_stdlib.h Reviewed-by: Janne Anttila
| * | | | Comment clarifications based on mkspecs review.Miikka Heikkinen2009-08-203-4/+8
| |/ / / | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-194-3/+4
| |\ \ \
| | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: tests/auto/auto.pro
| | | * | mingw: make it possible to build without rtti supportThierry Bastian2009-08-181-0/+1
| | | | |
| | * | | Changed names and URLs to reflect name change.axis2009-08-193-3/+3
| | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| * | | | Review fixes for qmake (project.cpp cleanup)Miikka Heikkinen2009-08-192-3/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed symbian specific functionality from project.cpp: - generate_test_uid qmake function removed - Uids are now generated automatically for projects that don't have one. - Usage of ICON (in application_icon.prf) now requires explicit UID3 definition. - Autotests that require UID3 in .pro now define it explicitly - Move most symbian specific function implementations away from project.cpp to files under generators/symbian Reviewed-by: Janne Anttila
* | | | Update schema version number for SBSv2 Qt integrationIain2009-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | New version of SBSv2 build schema release, but no impact on our file, so just update the version number. Reviewed-by: TrustMe
* | | | Ensure the correct set of symbols are exported in the DEF files (part 1)Iain2009-08-191-1/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | For DLLs using Qt-style class level exports, ensure that only public symbols are exported For static libraries (static, staticlib configs) we don't want/need/ can't have a DEF file
* | | Merge commit 'qt/master'Jason Barron2009-08-186-6/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMorten Sorvig2009-08-174-4/+4
| |\ \
| | * | Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-174-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
| * | | Fix compiler flags setting for .mm files on Mac.Morten Sorvig2009-08-171-2/+1
| |/ / | | | | | | | | | | | | | | | Commit 7f1cba82 causes {x86, x86_64, ppc, ppc64}.prf to be loaded before objective_c.prf. This will add content to QMAKE_OBJECTIVE_CFLAGS, causing the isEmpty test to skip populating QMAKE_OBJECTIVE_CFLAGS. Remove the isEmpty test to fix the issue.
| * | Remove yet another forgotten debug message.Morten Sorvig2009-08-131-1/+0
| | |
| * | Pick a suitable default architecture for qmake-based applications.Morten Sorvig2009-08-131-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the Qt package contains one of x86 and x86_64, pick that one. If it contains both then use the compiler default. Make a similiar decision for PowerPC-based systems. Note that this logic assumes that Qt has been configured with an architecture that is usable on the system. Reviewed-by: Marius Storm-Olsen
* | | Merge commit 'qt/master'Jason Barron2009-08-13115-109/+204
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * | Update contact URL in license headers.Jason McDonald2009-08-12111-111/+111
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtThomas Hartmann2009-08-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp
| * | | New mkspecs for Windows Mobile 6.5Thomas Hartmann2009-08-106-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need extra mkspecs for Windows Mobile 6.5 to support gestures, since gestures are only supported with 6.5 Reviewed-by: Maurice
* | | | Merge commit 'qt/master'Jason Barron2009-08-101-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-102-0/+186
| |\ \ \ | | |/ /
| * | | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+188
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | A small hack to enable gles2 at configure timeGunnar Sletta2009-08-062-0/+186
| |/ / | | | | | | | | | Reviewed-by: Trond
| * | Replace instances of weak linking for 10.3 with 10.4.Morten Sorvig2009-08-061-3/+2
| | |
* | | Enable symbol visibility when compiling with RVCT.axis2009-08-061-1/+1
| | | | | | | | | | | | | | | This takes advantage of new functionality in RVCT 2.2, and requires build 683 beta or later.
* | | Update license headers according to commit 858c70f768e.axis2009-08-068-13/+13
| | | | | | | | | | | | RevBy: Trust me
* | | Replaced $MODULE$ with hardcoded module names.axis2009-08-061-2/+2
| | | | | | | | | | | | RevBy: Trust me
* | | Fix extern WebKit build that uses qmake generators.Simon Hausmann2009-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore.pro's generators use QMAKE_DEL, which when used with del.exe works if the file is present or not. In the QMAKE_SH branch QMAKE_DEL is mapped to rm, which complaints if the file to delete doesn't exist. Similar to del.exe and unix.conf use rm -f instead of rm for QMAKE_DEL in the QMAKE_SH branch. Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-065-9/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
generated by cgit v0.12 at 2024-12-28 13:18:06 (GMT)