summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt.prf
Commit message (Collapse)AuthorAgeFilesLines
* Fix DEPLOYMENT_PLUGIN for graphicssystem pluginsMiikka Heikkinen2012-01-311-1/+1
| | | | | | | | | ALLQTPLUGINS value had extra space in qt.prf, making graphicssystem plugins not have correct path when specified in DEPLOYMENT_PLUGIN. Task-number: QTBUG-23963 Change-Id: I67a36fa7fafd7ed0960e197fe3401fc6dd779578 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed automatic plugin path resolving for predefined Qt plugins.Janne Anttila2011-09-191-7/+13
| | | | | | | | | | | | | When Qt is configured for static build, importing static plugins is supposed to work as described in docs: http://doc.qt.nokia.com/latest/qtplugin.html#Q_IMPORT_PLUGIN This commit updates the qmake mapping for predefined Qt plugins, so that Qt plugins are automatically found when QTPLUGIN keyword is used. Task-number: QTBUG-18609 Merge-request: 1391 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-2/+2
| | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* Added meego graphics system helper to features/qt.prf and syncqt.Samuel Rødal2010-09-101-1/+2
| | | | | | MeeGo graphics system helper headers are now synced and the correct include path and libraries are added to an application by doing QT += meegographicssystem helper in the .pro file.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-111-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits) Disable minRightBearing optimization in QTextLayout on Mac Added one test for QRegExp QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given. Add text decoration support to QStaticText Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" ...
| * Remove the definition of QT_HAVE_NEON from qt.prfBenjamin Poulain2010-08-061-1/+0
| | | | | | | | | | | | | | | | 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
* | don't load modules from qt.prfOswald Buddenhagen2010-08-111-3/+0
|/ | | | | | | | they are already loaded in qconfig.pri, which is loaded from qt_config.prf, which is explicitly loaded by every qmake spec. Reviewed-by: Simon Hausmann Reviewed-by: joerg
* Move the SIMD defines to the common declaration of Qt symbolsBenjamin Poulain2010-08-031-0/+13
| | | | | | | | 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 branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-211-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes. Add my 4.6.3 changes Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3 Switch Symbian^3 QCursor implementation back to 5.0 way fix qmake -project once more
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-211-0/+3
| |\
| | * Add support for including module specific .pri files as part of qt.prf handlingSimon Hausmann2010-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* | | Removed mediaservices.Kurt Korbatits2010-05-181-2/+1
|/ /
* | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-1/+1
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-1/+2
|/
* Implement some changes to the AIX xlC mkspec suggested by IBM.Thiago Macieira2010-04-131-2/+8
| | | | | | | | | | | | | | Set -bmaxdata to 0x8000000 for normal 32-bit Qt programs, to allow them to access more memory. Increase that limit to the maximum allowed when linking to QtWebKit (even though we don't support WebKit with xlC, there are patches to do that). For 64-bit, simply add the "big TOC" flag, which enables accessing more symbols that cannot be reached by a 16-bit addressing. Only QtWebKit strictly needs it, but IBM suggests as a good flag for everyone. Reviewed-by: Thomas Zander
* Attempt at readding the capital P headers for PhononThiago Macieira2010-01-061-0/+1
|
* Remove special Phonon processing from syncqt.Thiago Macieira2010-01-061-3/+0
| | | | | | | | | | | Restore original Qt 4.4 behaviour. The capital P headers are not correct because of frameworks on Mac. More info, see thread: http://lists.kde.org/?l=kde-multimedia&m=126045273702498&w=2 Task-number: QTBUG-4685 Reviewed-by: Trust Me
* Declarative building infrastructure.Warwick Allison2009-11-041-1/+2
| | | | Does nothing if no declarative directories installed.
* 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
* 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
* 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 'qt/master-stable'Jason Barron2009-08-061-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge AudioServices into mainline.Justin McPherson2009-08-051-1/+2
| |
* | Merge commit 'qt/master-stable'Jason Barron2009-07-271-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * Make openvg.prf work properlyRhys Weatherley2009-07-191-0/+1
| | | | | | | | | | | | | | This change makes "QT += openvg" include the right includes and libs via openvg.prf automatically. Reviewed-by: trustme
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-1/+2
| | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
| * Long live Qt!Lars Knoll2009-03-231-0/+183
|
* Long live Qt for S60!axis2009-04-241-0/+191
generated by cgit v0.12 at 2024-08-23 00:52:12 (GMT)