summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-11-105-10/+67
|\ | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-041-2/+10
| | | | | | | | | | Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| * Fixed compilation and linking of EGL on Windows CE.Trond Kjernåsen2009-11-041-3/+29
| | | | | | | | | | | | | | | | | | Moved duplicated and broken code for setting up the include and library paths into the egl.prf feature file, which egl.pri and opengl.pro now includes using the qmake feature system. Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| * Declarative building infrastructure.Warwick Allison2009-11-041-1/+2
| | | | | | | | Does nothing if no declarative directories installed.
| * Sanitize building Qt with OpenGL ES supportHarald Fernengel2009-11-021-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | introduce QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES2 so we do not have to force users to copy/paste around entire mkspecs just to change the OpenGL backend. This should make the "-opengl es2" (and friends) configure option work out of the box with any mkspec on Linux+WinCE. Also removes a WinCE specific hack that is not required anymore. Reviewed-by: Tom Cooksey Reviewed-by: Trond Kjernåsen Approved-by: Lars Knoll
| * Build fix for QtXmlPatterns' examples on SymbianFrans Englich2009-10-271-0/+4
| | | | | | | | | | | | This is the same workaround as Janne did for QtWebkit. Reviewed-by: Janne Koskinen
* | Merge branch '4.6'Thiago Macieira2009-10-211-1/+1
|\ \ | |/
| * Fixed the build for people who only have emulator binaries installedaxis2009-10-191-1/+1
| | | | | | | | RevBy: mread
* | Merge branch '4.6'Thiago Macieira2009-10-163-4/+17
|\ \ | |/ | | | | | | | | Conflicts: translations/assistant_adp_pl.ts translations/assistant_adp_ru.ts
| * Fixed uitools.prf to include QtUiTools.lib statically in SymbianMiikka Heikkinen2009-10-161-1/+3
| | | | | | | | | | | | | | | | | | Using just -lQtUiTools instead of -lQtUiTools.lib will make qmake attempt to autodetect whether or not the lib is static or dynamic, which will not work since QtUiTools is not necessarily yet built. Task-number: QT-1018 Reviewed-by: Janne Koskinen
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Janne Koskinen2009-10-141-0/+5
| |\
| | * Bump heap and stack size for Phonon plugins.Frans Englich2009-10-141-0/+5
| | | | | | | | | | | | | | | | | | This is required by the Helix plugin. As discussed with Dallas team/Fu Liz. Reviewed-by: Shane Kearns
| * | QtWebkit demos&examples compilation fix for SymbianJanne Koskinen2009-10-141-3/+9
| |/ | | | | | | | | | | | | | | Fix for applications not compiling containing #include<QtWebkit> due to relative inclusion problem in Symbian build environment. Task-number: QTBUG-4846 Reviewed-by: Iain
* | Merge branch '4.6'Thiago Macieira2009-10-081-1/+1
|\ \ | |/ | | | | | | Conflicts: tools/assistant/translations/translations_adp.pro
| * Avoid adding a debug library to the glue projects, when debug_and_releaseMarius Storm-Olsen2009-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The VCPROJ/SLN generator generates dependencies on the glue project, so the glue must use the correct library for the dependencies to be correct. The qtAddLibrary() would add the project 'default' to the glue, which could end up adding a debug lib to the glue, so the dependency checker wouldn't find the proper project. We therefore force qtAddLibrary to only add d/_debug if we're not using debug_and_release, or not in the glue part Reviewed-by: Rohan McGovern
* | Merge branch '4.6'Thiago Macieira2009-10-051-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.h tools/assistant/translations/translations_adp.pro tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf tools/qdoc3/test/qt.qdocconf translations/assistant_adp_de.ts
| * 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
* | Merge branch '4.6'Thiago Macieira2009-09-302-1/+16
|\ \ | |/ | | | | | | Conflicts: src/corelib/io/qdatastream.h
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-307-17/+40
| |\
| | * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-291-0/+4
| | |\
| | * | 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.
| * | | 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 '4.6'Thiago Macieira2009-09-295-6/+14
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: doc/src/qt4-intro.qdoc
| * | | 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
| * | 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
| * | 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
* | | Revert "Fix spelling and reword."Daniel Molkentin2009-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | This is fixed better in 4.6. Don't make merging harder than it has to be. This reverts commit 8a441f3cf8a2cbc92861b7c55dd4664da4e8130b.
* | | Fix spelling and reword.Daniel Molkentin2009-09-181-2/+2
| | |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-09-181-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp src/gui/kernel/qwidget_x11.cpp
| * | Workaround for problems interworking RVCT-built s60main with GCCE appsIain2009-09-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-09-171-12/+1
|\ \ \ | |/ /
| * | 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
* | | Merge branch '4.6'Olivier Goffart2009-09-101-0/+6
|\ \ \ | |/ /
| * | Make static builds work fot Qt/Cocoa.Morten Sorvig2009-09-101-0/+6
| |/ | | | | | | | | Add -all_load to make Objective-C categories work. Enable hide_symbols to remove visibility issues.
* | Merge branch '4.6'Thiago Macieira2009-09-041-1/+1
|\ \ | |/
| * Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-031-1/+1
| |\
| | * Move the S60/Avkon framework initialization into QtGui.axis2009-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch '4.6'Thiago Macieira2009-09-031-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qpluginbase.pri tests/benchmarks/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp tools/assistant/compat/mainwindow.cpp tools/assistant/compat/mainwindow.ui tools/assistant/tools/assistant/doc/assistant.qdocconf
| * | 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
* | Remove deprecated Assistant and AssistantClient.kh12009-08-311-9/+0
|/
* 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 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-212-3/+7
|\ \
| * | Comment clarifications based on mkspecs review.Miikka Heikkinen2009-08-202-3/+7
| | | | | | | | | | | | Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-11-24 14:50:22 (GMT)