summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
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
* 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
* Workaround for problems interworking RVCT-built s60main with GCCE appsIain2009-09-181-1/+2
| | | | | | | | | | | | | | | 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
* Make static builds work fot Qt/Cocoa.Morten Sorvig2009-09-101-0/+2
| | | | | Add -all_load to make Objective-C categories work. Enable hide_symbols to remove visibility issues.
* Update license headers again.Jason McDonald2009-09-092-8/+8
| | | | Reviewed-by: Trust Me
* use a single qplatformdefs.h for all Windows CE mkspecsJoerg Bornemann2009-09-082-0/+131
| | | | | | | | | 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
* Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-031-2/+2
|\
| * Move the S60/Avkon framework initialization into QtGui.axis2009-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | 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-312-26/+26
|/ | | | Reviewed-by: Trust Me
* Merge commit 'origin/master' into symbolVisibilityIain2009-08-203-7/+7
|\
| * 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-201-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Changed names and URLs to reflect name change.axis2009-08-192-2/+2
| | | | | | | | RevBy: Trust me
* | 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-stable'Jason Barron2009-08-101-3/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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-062-5/+5
| | | | | | | | 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>
* | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-3/+3
| | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* | Added some spaces to pkg_prerules statements to make output more readable.Janne Anttila2009-07-301-1/+2
| |
* | Extended PKG customization possibilities via qmake.Janne Anttila2009-07-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Make S60 integration optional.Jason Barron2009-07-151-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than anything else. One of the side effects of this work was that it was relatively little work to get QtGui compiling when Q_WS_S60 is not defined. Based on this we introduce two new configure options that control S60 integration. Currently the -no-s60 option will not work entirely because the 's60main' module has not yet been refactored and still has a dependancy on the S60 libraries. Reviewed-by: axis <qt-info@nokia.com>
* | Move the EGL library to a different qmake variable.Jason Barron2009-07-081-1/+2
| | | | | | | | | | | | | | | | The EGL code is now a part of QtGui so QtOpenVG doesn't need to link against it anymore. This also removes the need to link against cone since we don't need to call DrawableWindow() from the OpenVG code. We add the EGL library to a separate variable which is then used when QT_CONFIG contains the "egl" feature.
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-302-2/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+2
| |\ | | | | | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| | * Some fixes for LLVM on the Mac.Norwegian Rock Cat2009-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GCC-LLVM compilers on Snow Leopard have advanced enough to make them worth the effort to make sure they at least work again. These are the minimum changes needed to make things work. The current gcc-llvm compilers on Mac OS X support Objective-C++ so, no need to special case them anymore either. You STILL need to make sure your path is correct however. Reviewed by: Morten Sørvig
| * | Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-241-0/+3
| | | | | | | | | | | | | | | | | | | | | ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags on the link line if it is needed by the OpenVG engine. Reviewed-by: trustme
| * | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+3
| | | | | | | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | Merge branch '4.5'Tom Cooksey2009-05-281-2/+5
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| * | Merge branch '4.5'Thiago Macieira2009-05-111-4/+4
| |\ \
| * | | Change optimization flags from Os to O2 for OS X applications.Morten Sørvig2009-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Qt itself was O2 from 4.2 and up, this changes it for applications as well. Reviewed-by: nrc
| * | | Long live Qt!Lars Knoll2009-03-239-0/+464
| / /
* | | More robust handling for stdapis pathsMiikka Heikkinen2009-06-121-3/+0
| | |
* | | Switched QDesktopServices mail-to URL handling to RSendAs in Symbian.Janne Anttila2009-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier used CSendUi required extensiva capabilities to work correctly, that's why "new email" option in desktop services example application did not work correctly with self signed capabilities. RSendAs requires lower capabilities since SendAs server (separate process) takes care of necessary actions to send the message.
* | | Merge branch 'imSelections'axis2009-06-032-2/+62
|\ \ \
| * | | Fixed incorrect headers.axis2009-06-032-2/+62
| | | |
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-021-2/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
| * | | support for -ltcg configure switch for Windows CE buildsJoerg Bornemann2009-05-281-2/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Additionally we turn -ltcg on by default on Windows CE. See commit 56191830 for details. Reviewed-by: mauricek BT: yes
* | | Removed PAGED keyword from S60 3.1 buildsMiikka Heikkinen2009-05-291-0/+1
| |/ |/|
* | Revert "Enable symbol visibility when compiling with RVCT."axis2009-05-251-1/+1
| | | | | | | | | | | | | | This reverts commit c33abd370470a0097cc1fbb858e1218ba110e0df. We will need this patch in the end, but right now it's causing too much trouble with the compiler. To return soon!
* | Enable symbol visibility when compiling with RVCT.axis2009-05-111-1/+1
| | | | | | | | | | This takes advantage of new functionality in RVCT 2.2, and requires build 671 beta or later.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-111-4/+4
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtemporaryfile/qtemporaryfile.pro
| * macx-g++42 spec linker was gcc instead of gcc-4.2João Abecasis2009-05-081-4/+4
| | | | | | | | | | | | | | | | Better alternative to 9ffcf3737901c49acb1a1bc6b65572d195d78a5d Task-number: 253052 Reviewed-by: Norwegian Rock Cat Reviewed-by: MortenS
| * Long live Qt 4.5!Lars Knoll2009-03-239-0/+464
|
* ARMV6 optimizations to qdrawhelperMiikka Heikkinen2009-05-051-1/+1
|
generated by cgit v0.12 at 2024-12-11 22:07:14 (GMT)