summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Workaround for the problem with abld ignoring OPTION_REPLACEIain2009-10-051-1/+7
| | | | | | | | | abld in the S60 SDKs has a bug where OPTION_REPLACE cannot be used to remove options from the command line (ie. replace them with nothing), so this workaround introduces a macro definition (that should never be used) as a harmless replacement option. Reviewed-by: Aleksandar Sasha Babic
* Changed Qt package name in pkg and generated sis files for Symbian.Janne Anttila2009-10-051-4/+4
| | | | | | | | | It was decided on weekly telco that Symbian pkg and sis files can use plain Qt name, since it is already clear that user is installing "Qt for Symbian" version of Qt. Task-number: QT-772 Reviewed-by: Miikka Heikkinen
* renaming ppc mkspec to powerpcJørgen Lind2009-10-022-0/+0
| | | | Reviewed-by:paul
* Give the qws ppc mkspec usable default valuesJørgen Lind2009-10-021-0/+11
| | | | | | and keep ./configure -embedded still work on ppc platforms Reviewed-by:tom
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-30143-1650/+848
|\
| * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-291-0/+4
| |\
| | * Webcore build break on Symbian fixJanne Koskinen2009-09-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Prepending adds epoc32\include too early into generated systeminclude path search order causing Webcore build to break due to wrong animation.h header getting included. Reviewed-by: Jason Barron
| | * Fix compilation of files that #include <QtGui> on newer Symbian SDKs.Jason Barron2009-09-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new public classes in the 's60framework' sub-directory of QtGui introduce a header file dependency to the middleware layer of the SDK by including 'aknapp.h'. Since the build system doesn't know if you have included QtGui or not, the closest approximation is to append the middleware layer include path in cases where the QT variable contains 'gui' Reviewed-by: axis
| * | Fixed build errors due to header filename clashes between epoc32/include and ↵Gareth Stockwell2009-09-281-0/+15
| |/ | | | | | | | | | | | | | | Phonon. Both epoc32/include and $QTDIR/include/Phonon contain a file called videoplayer.h. Both of these directories are listed as SYSTEMINCLUDE paths in the generated MMP file, with the Phonon path coming first. This means that '#include <videoplayer.h>' picks up the Phonon header rather than (as intended) the Symbian one. A new qmake variable, PREPEND_INCLUDEPATH, is defined, allowing the .pro file to specify that /epoc32/include should be the first SYSTEMINCLUDE.
| * Mac: remove visibility warnings when building in macRichard Moe Gustavsen2009-09-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Some changes was done on Mac to support Qt building statically on Cocoa. Unfortunatly, the change lead to many visibility warnings because, with the change, src/tools/bootstrap was made with symbols hidden by default (-fvisibility=hidden). Then, when building the tools (moc, rcc etc), visibility was public by default (for internal classes used by Qt). This caused warnings. The change is now temporarily reverted until Morten get a second chance to look at it. Rev-By: prasanth
| * Try to support Qt 4.4-style Phonon includes in Qt.Thiago Macieira2009-09-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces an undocumented "phonon_compat" subdir and also adds it to the INCLUDEPATH when QT += phonon is specified. With this, these styles of #includes should be supported: #include <Phonon> #include <Phonon/Phonon> #include <phonon> #include <phonon/phonon> #include <Phonon/MediaObject> #include <phonon/mediaobject.h> Still need to check if the headers get installed during "make install". I couldn't find where in our code that is done. BT: yes Reviewed-By: Trust Me
| * Fix "make sis" target for -xplatform symbian-sbsv2Shane Kearns2009-09-221-2/+3
| | | | | | | | | | | | | | | | CFG_PATH evaluates as "udeb", not "UDEB" when building the debug-armv5 target. So changed the FLM to check for that. Also changed the variable redefinition to ifeq/else/endif. Reviewed-by: Iain
| * Docs: Fix spelling and reword docs about S60 specifics.Daniel Molkentin2009-09-221-2/+3
| | | | | | | | Reviewed-By: TrustMe
| * Set maximum heap to 32MB for Symbian autotests.Miikka Heikkinen2009-09-221-1/+1
| | | | | | | | | | | | | | Several script and webkit tests require increased maximum heap in emulator, so just increase the maximum heap for all autotests. Reviewed-by: Janne Koskinen
| * Give the soft key functionality it's own macro.Jason Barron2009-09-211-1/+1
| | | | | | | | | | | | | | | | | | Re-using QT_KEYPAD_NAVIGATION for soft keys is wrong since the two are independant concepts. This puts everything in a new macro called QT_SOFTKEYS_ENABLED. This will also insulate the embedded customers who use keypad navigation from the soft key changes. Reviewed-by: Alessandro Portale
| * Adding support for symbian graphics resources.Aleksandar Sasha Babic2009-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to convert from and to new Symbian type of graphics resource, namely SgImage. This only supported with the OpenVG graphics system. On other graphics systems this will return null QPixmap. Conflicts: src/corelib/global/qglobal.h src/gui/image/qpixmap.h src/gui/image/qpixmap_s60.cpp Reviewed-by: Jason Barron
| * Remove remaining support for win32-mwc mkspecIain2009-09-182-274/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.6 cannot be used with the win32-mwc makespec, as the Metrowerks compiler supplied with Symbian/S60 releases does not contain enough support to build the Qt host tools in a Unicode version, and ANSI support has been removed in 4.6. Alternative mkspecs are win32-g++, requiring mingw tools to be installed, or one of the win32-msvc.... mkspecs, requiring MS Visual Studio (Express edition is fine) The mwc makefile for qmake was already removed, so this just removes the remaining support. Reviewed-by: Jason Barron
| * Workaround for problems interworking RVCT-built s60main with GCCE appsIain2009-09-182-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for the fact that removing --export_all_vtbl from the RVCT command line seems to cause problems when linking the static s60main lib with apps built with GCCE (at least 4.3, haven't tested earlier versions) The root cause still needs to be found and fixed, after which this workaround can hopefully be removed. Problem observed on Symbian^3 release, RVCT 2.2 build 686, GCC-E 2009q1-162 release from CodeSourcery. Reviewed-by: axis
| * Remove unnecessary lines from MMP files when using libstdcppv5.dllIain2009-09-161-12/+1
| | | | | | | | | | | | | | SBSv1 has also been updated to define the appropriate macros and add the required library statements, so all that is needed is the STDCPP keyword Reviewed-by: mread
| * Make static builds work fot Qt/Cocoa.Morten Sorvig2009-09-102-0/+8
| | | | | | | | | | Add -all_load to make Objective-C categories work. Enable hide_symbols to remove visibility issues.
| * Add a mkspec for selecting gcc-4.0 on Mac OS X.Morten Sorvig2009-09-104-0/+190
| | | | | | | | This has one known use case: compiling with the 10.4u SDKi on 10.6.
| * Update license headers again.Jason McDonald2009-09-09119-476/+476
| | | | | | | | Reviewed-by: Trust Me
| * mkspec wince60standard-x86-msvc2005 addedJoerg Bornemann2009-09-083-73/+76
| | | | | | | | | | | | | | This is a mkspec template for creating x86 Windows CE 6 mkspecs. Task-number: 259850 Reviewed-by: mauricek
| * use a single qplatformdefs.h for all Windows CE mkspecsJoerg Bornemann2009-09-0830-908/+160
| | | | | | | | | | | | | | | | | | Additionally, mkspecs/wince.conf was moved to mkspecs/common/wince/qmake.conf The common qplatformdefs.h is also in that directory. Task-number: 259850 Reviewed-by: mauricek
* | Fixed symbian-sbsv2 build break in apps using debug_and_release.Miikka Heikkinen2009-09-041-1/+1
|/ | | | | | | Skipped addExclusiveBuilds function in debug_and_release.prf for all Symbian platforms, as it doesn't work with Symbian toolchain. Reviewed-by: Janne Anttila
* Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-032-3/+3
|\
| * Move the S60/Avkon framework initialization into QtGui.axis2009-09-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we avoid having a lot of code in a static (and unmaintainable) library. The s60main static library now currently has only one task: to call main(). To move the initialization into QtGui also meant a change in how the S60 framework is created, because we can no longer use the trick where we create and start the the S60 event loop and then have the framework call us back to start main(). The initialization now follows the creation and destruction of QApplication, which is a lot more in line with how other platforms do it. Since S60 doesn't support creating the environment, and *then* starting it (both are executed by the same call), we had to open up the S60 framework construction classes and just mirror what they do. This means that after QApplication construction is done, the S60 framework is initialized, but nothing will run yet and control will return to main(), where the user can start the event loop himself. One of the quirks of this approach is that the construction of the S60 framework makes a new cleanup stack. This means that any active traps will not be active anymore, and leaving without setting a new trap will most likely panic. This shouldn't be a problem for us, since Qt is never supposed to leave, but it means that if anyone uses the cleanup stack without setting a new trap, they will receive a panic. It was considered to add a trap mark in QApplication construction and then removing it on destruction, but it was dropped because leaving from main() is still undefined (even if the old cleanup stack would be restored in the destructor, we wouldn't be able to stop the exception from unwinding the stack, and the cleanup stack would then be unbalanced). RevBy: Jason Barron RevBy: Janne Anttila AutoTest: QWidget passed with same failure count
* | Renamed make 'sisx' target to 'sis' and QT_SISX_* variables to QT_SIS_*Janne Anttila2009-09-031-2/+2
| | | | | | | | | | | | Renaming done based feedback. Reviewed-by: TrustMe
* | Fixed Qt/S60 build failures when MOC_DIR contains a `.' anywhere.Rohan McGovern2009-09-031-6/+6
| | | | | | | | | | | | | | | | | | The Symbian build system can't handle directories starting with a `.', so qmake aborts if MOC_DIR and similar start with a `.'. However, the check for this condition was faulty and would include any path which contained a `.' anywhere. Reviewed-by: Michael Goddard
* | Removed stale fixed_stdlib.h file.Janne Anttila2009-09-021-64/+0
| | | | | | | | Reviewed-by: TrustMe
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-3114-182/+182
| | | | | | | | Reviewed-by: Trust Me
* | 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
generated by cgit v0.12 at 2024-11-14 00:52:26 (GMT)