summaryrefslogtreecommitdiffstats
path: root/src/gui/gui.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-5/+3
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * Correct some parameters for the makefile build sytem, armcc and gcceLiang Qi2011-04-071-5/+3
| | | | | | | | Reviewed-by: axis
* | Introduce QFontEngineDirectWriteEskil Abrahamsen Blomfeldt2011-03-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a font engine for subpixel positioned text on Windows Vista (with platform update) and Windows 7. If selected during configuration, the engine will be selected only when the hinting preference of a font is set to None or Vertical hinting. The font database uses most of the same logic but creates a direct write font based on the LOGFONT rather than a GDI handle. The engine is currently regarded as experimental, meaning that code using it should do substantial testing to make sure it covers their use cases. Task-number: QTBUG-12678 Reviewed-by: Jiang Jiang
* | Fix builds with compilers without --with-fpu=neon as a default.Robin Burchell2011-02-041-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes introduced in fac68dca46131d63f11c37210834073848f5a93d do not work correctly on compilers without --with-fpu=neon as a default, NEON_SOURCES would be (incorrectly) compiled without -mfpu=neon, resulting in build failure. This also moves -mfpu=neon after CXXFLAGS, as CXXFLAGS may contain -mfpu=vfpv3-d16. Issue noted by Carsten Munk while building Qt for MeeGo ARM with NEON. Merge-request: 1042 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | qt project files: create pkg-config files for mingwMark Brand2011-01-101-1/+1
| | | | | | | | | | | | | | This is mostly the same as for unix. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * Don't set -mfpu=neon globally if the compiler supports neon.Samuel Rødal2010-11-111-2/+1
| | | | | | | | | | | | | | | | | | | | By default only drawhelpers and image loaders will now use neon. If -mfpu=neon has been explicitly enabled in the mkspec, QT_ALWAYS_HAVE_NEON will be defined, allowing the use of neon intrinsics elsewhere. Task-number: QTBUG-15163 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-15/+0
|\ \ | |/ | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * Moved the partial deployment section to qbase.pri.axis2010-09-271-15/+0
| | | | | | | | | | | | This way it will be available to all modules, not just selected ones. RevBy: Miikka Heikkinen
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h src/corelib/tools/qsimd.cpp
| * linux-icc can take -msse2, -msse3, etc. flags, so enable this as wellThiago Macieira2010-08-241-1/+1
| | | | | | | | | | | | | | | | | | Otherwise, we actually get compilation errors because configure detected that the compiler supports this, so QT_HAVE_SSSE3 is defined, but we then compile qimage_ssse3.cpp without -mssse3 (Among others) Reviewed-By: Benjamin Poulain
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-191-11/+19
|\ \ | |/
| * Remove the definition of QT_HAVE_NEON from qt.prfBenjamin Poulain2010-08-061-1/+2
| | | | | | | | | | | | | | | | Since we cannot use NEON and VFP concurrently, it is better not to force neon all over the place :) Reviewed-by: Andreas Kling Reviewed-by: Thiago Macieira
| * Move the build of Neon file from painting.pri to gui.proBenjamin Poulain2010-08-061-0/+18
| | | | | | | | | | | | | | Move the build operation of files using Neon from painting.pri to gui.pro. This will make easier to add Neon files in the future. Reviewed-by: Andreas Kling
| * Move the SIMD defines to the common declaration of Qt symbolsBenjamin Poulain2010-08-031-11/+0
| | | | | | | | | | | | | | | | Move the #defines for the SIMD extension to the common code in order to be able to use them from any module without copying their definition. Reviewed-by: Andreas Kling
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-041-0/+25
|\ \ | |/ | | | | | | Conflicts: configure
| * Extend the build system to SSSE3Benjamin Poulain2010-07-261-0/+20
| | | | | | | | | | | | | | Extend the build of QtGui to include generic compilation of files specific to SSSE3. Also extend qsimd_p.h for the new #includes.
| * Add support for more vector instructions on x86Benjamin Poulain2010-07-201-0/+5
| | | | | | | | | | | | | | | | Add the configuration, autodetection, and the #define for vector instructions on x86. The configuration has been extended with SSE3, SSSE3, SSE4.1, SSE4.2 and AVX. Reviewed-by: Andreas Kling
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-141-1/+127
|\ \ | |/ | | | | | | | | | | Conflicts: src/gui/image/image.pri src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp
| * Move logic for building SIMD extensions to gui.proJohn Brooks2010-07-071-0/+126
| | | | | | | | | | | | | | | | Enables SIMD files to be built outside of painting.pri by appending files to SSE_SOURCES etc. Merge-request: 725 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-1/+1
| | | | | | | | | | Task: QTBUG-11396 RevBy: Miikka Heikkinen
* | Adding -qpa configure switchJørgen Lind2010-06-241-1/+1
| | | | | | | | also renaming the embedded_lite qmake switch to be qpa
* | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-181-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/qws.conf src/corelib/io/qresource.cpp src/gui/image/qpixmapdata_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/opengl/qgl_p.h src/plugins/mediaservices/gstreamer/gstreamer.pro
| * fix irix buildOswald Buddenhagen2010-05-201-0/+1
| | | | | | | | | | Task-number: QTBUG-10611 Reviewed-by: joerg
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-101-2/+1
|\ \ | |/ | | | | | | | | Conflicts: src/gui/egl/egl.pri src/gui/painting/qwindowsurface_p.h
| * Stub implementations for EGL for symbianShane Kearns2010-04-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done to keep binary compatibility between Qt built with openvg vs Qt built without openvg support. The problem is that Symbian uses .def files to map between exported symbol names and ordinals in the DLL export table. The alternative of manually maintaining two versions of the QtGui def files proved to be too error prone and time consuming. Note that the EGL exports are defined in a private header, for use by the openvg and opengl graphics system plugins. These plugins should always be compiled against Qt configured with support for the graphics system, as the headers contain default parameters which are inlined into the plugin binary. Task-number: QTBUG-7870 Reviewed-by: Tom Cooksey
* | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-211-6/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/kernel/qapplication.cpp src/gui/painting/qbackingstore.cpp src/opengl/qgl.cpp src/opengl/qgl_p.h src/plugins/plugins.pro tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir tools/tools.pro
| * Fix build error in QtGui armv5 udebShane Kearns2010-04-091-1/+1
| | | | | | | | | | | | Typo in the .pro file was causing the linker flags to never be set. Reviewed-by: Trust Me
| * Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-301-0/+1
| | | | | | | | | | | | Temporary fix until configure.exe can be re-compiled. Reviewed-By: TrustMe
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-1/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| | * Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pkg statements were generated in invalid order if user used pkg_prerules to redefine languages supported by the pkg file. Also made it possible to override dependency statements autogenerated for Qt and QtWebkit, as these statements need to be user defined in case of multiple languages. Defining the following in .pro removes all dependencies from pkg rules: default_deployment.pkg_prerules -= \ pkg_depends_webkit \ pkg_depends_qt \ pkg_platform_dependencies Task-number: QTBUG-9279 Reviewed-by: Janne Anttila
| * | Use the same concept for per-lib tweaks as armccThomas Zander2010-03-091-4/+6
| | | | | | | | | | | | | | | | | | Now the compiler specific options in gui.pro and WebCore.pro are only for the mmp based build systems. Lets make that clear and mark them as such.
| * | Corrected library locations for deployment on Symbian.axis2010-02-251-1/+1
| |/
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-011-4/+23
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/gui/egl/qegl.cpp src/gui/kernel/qdnd_p.h
| * Partial upgrade packages for QtCore and QtGuiShane Kearns2010-02-161-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | When debugging or benchmarking changes in QtCore / QtGui, it is inconvenient to reinstall the whole of Qt. This allows 'make sis' to generate a partial upgrade sis files, which can be installed on top of an existing Qt installation. This relies on binary compatibility, so you should be using def files. Self-signed partial upgrade can only install on top of self-signed Qt. Reviewed-by: Miikka Heikkinen
* | Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-101-1/+2
|\ \ | |/ | | | | | | | | Conflicts: configure tests/auto/qwidget/tst_qwidget.cpp
| * Adjust rw base address for gui built with GCCE for Symbian OSIain2010-02-031-1/+2
| | | | | | | | | | | | fixed during merge to match new style flag setting. Reviewed-by: Janne Koskinen
* | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-141-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.cpp src/gui/dialogs/dialogs.pri
| * Disable linker warning 6780 in RVCT builds for Symbian OSIain2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker warning that indicates symbol visibility changes is not useful as it is an expected change to symbol visibility and produces lots of clutter in the build logs. (It is not desirable to follow the ELF spec when it comes to symbol visibility in this case, which is why the linker warns and we ignore it) This is likely to be a Raptor-only issue - I believe abld suppresses the warning by default (at least in ABIv1 mode) Also update gui.pro to use LFLAGS rather than MMP_RULES to alter the arguments to ARMCC toolchain. qmake ought to detect this (incorrect) usage of MMP_RULES and abort MMP file generation - raised QTBU-5961 to look at this. Reviewed-by: Shane Kearns
| * Revert "Revert all GUI changes from the MMF work."Frans Englich2009-09-281-1/+1
| | | | | | | | This reverts commit 9345d47c3945b61a27724508e8b3d0aaf7b57bcf.
| * Revert all GUI changes from the MMF work.Frans Englich2009-09-241-1/+1
| | | | | | | | We revert because they seem to create regressions in the QWidget auto test.
| * Remove debugging code.Frans Englich2009-09-241-4/+1
| |
| * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-231-2/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml demos/embedded/fluidlauncher/fluidlauncher.pro src/corelib/io/io.pri src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qwidget_s60.cpp src/s60installs/qt_libs.pro
| | * 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
| * | Oops: turned off logging in QtGuiGareth Stockwell2009-09-231-1/+1
| | |
| * | Experimenting to make video visible.Gareth Stockwell2009-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the hack to set translucent window background in the mediaplayer. Then tried the following: 1. Direct write to backing store: does not work (backing bitmap is 16MU) 2. Set window background color: does not work (is over-written by control's Draw function) 3. Brush using CWindowGc from widget's paint event: does not work (is over-written by control's Draw function) 4. Hack QSymbianControl to blit a transparent bitmap from the Draw function: does work 5. Hack QSymbianControl to brush using CWindowGc from the Draw function: does work Configuration 5 is the one being committed. Other things we could try: 6. Trigger switch to 16MA backing store if child widgets have been created. This could be tested by calling RWindowTreeNode::Child on the TLW's window. - Maybe we could test whether the child window's display mode is 16MA? 7. Somehow tell QSymbianControl not to draw anything at all - Based on setting Qt::WA_PaintOnScreen? - Then we either: - (Ideally) do nothing, and rely on video stack to paint the necessary transparency - Brush using CWindowGc from widget's paint event
| * | Cleanup debugging code.Frans Englich2009-09-231-0/+3
| | |
* | | Please welcome the Lighthouse Research Project!Paul Olav Tvete2009-09-071-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | Lighthouse is a lighter, nimbler version of Qt/Embedded, which does not contain a window system. Instead, it uses graphics system plugins to provide the necessary functionality or interface with existing window systems. The first version was written by Rhys. Squashed commit.
* | Move the S60/Avkon framework initialization into QtGui.axis2009-09-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-211-0/+1
|\ \ | |/ |/| | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
generated by cgit v0.12 at 2024-12-28 22:21:27 (GMT)