summaryrefslogtreecommitdiffstats
path: root/src/corelib/corelib.pro
Commit message (Collapse)AuthorAgeFilesLines
* Fix build for platforms that use QPA other than IOSPeter Hartmann2012-09-191-1/+1
| | | | | | | | | | | For instance on Blackberry this would try to include Mac libraries as well. In Qt 5 this is still working. Change-Id: Iae9d3b7e1b988ac8932c58deabfeb249cd2cfc2e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOSIan Dean2012-09-181-1/+1
| | | | | | | Similar work was done in Qt5 in Change Id3b02316 Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Enable storage of global Qt settings in app-local settings file on MacPasi Matilainen2012-03-081-2/+2
| | | | | | | | | | | | | The Mac App Store has limitations on where applications can write their settings, and com.trolltech.plist is not allowed. Changed the settings code to store all settings in the app-local file when the application runs in sandbox, or when the application's Info.plist contains a key "ForAppStore" with value "yes". The application's bundle identifier is also used for naming the settings file in these cases. Task-number: QTBUG-16549 Change-Id: Idd2241fbd7eb346da987226f05460642b0d6e5a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix bug about daylight saving missing on Symbian platfrom.Honglei Zhang2011-05-291-0/+1
| | | | | | | | | | | Daylight saving support for QDateTime is missing from Symbian platform. This is bug fix for QTBUG-6859. This bug was fixed by commit 2a20705. However, this original fix was removed by 01cf310d2 because of different implementation before S60 5.0 platform. This fix is re-applied since Qt is not going to support S60 3.x platform. Task-number: QTBUG-6859 Reviewed-by: Trust Me
* Fix CoreServices framework addition for qpa.Morten Johan Sørvig2011-03-161-7/+6
| | | | | | Test against the coreservices QT_CONFIG on qpa, unconditionally add CoreFoundation for mac and darwin
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-3/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Change paging attributes for Symbian binariesIain2011-02-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed UNPAGED workaround from QtCore and QtSql on OS releases where data paging is supported. Depends on new macro being defined in the OS builds (SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED) to allow us to detect this. Data exports are supported in all S^3 builds after early 2009, however, this macro is only added recently (and thus isn't defined in, eg. Symbian Foundation PDKs (v3.0.4), or current releases (v0.9) of the S^3 SDK from Nokia). Thus building Qt against these older S^3 builds will still result in QtCore and QtSql being unpaged. Also, remove PAGED keyword from all Qt-based software. This changes the code paging field in the Symbian (E32Image) header from "paged" to "default". Thus it is left to the configuration of the particular device whether paging is used for the binary or not. All devices that support code paging should have it turned on (the value is stored in the HAL, so can be checked using eg. fshell); data paging may or may not be turned on depending on the device characteristics. Leaving both code and data paging as "default" means that any limitations in the device (eg. around flash wear) can be controlled by that device by disabling the appropriate types of paging. This change also leaves the way open to deprecated PAGED as a keyword in the Symbian build systems, so you can only opt out of paging. This makes more sense, as the default for code paging will be on, the default for data paging will be on if the device can handle it, and binaries should only be opting out of paging if they have some specific real-time requirements that paging inhibits. Task-number: QT-3503 Task-number: QTBUG-13931 Reviewed-by: Shane Kearns
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-7/+0
|\| | | | | | | | | | | | | | | | | | | | | 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-7/+0
| | | | | | | | | | | | | | | | | | | | 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>
* | Lighthouse on OS X.Morten Johan Sørvig2010-10-201-1/+8
| | | | | | | | Reviewed-by: Jørgen
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul 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/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-191-31/+1
|\| | | | | | | | | Conflicts: src/opengl/qgl_p.h
| * Remove the definition of QT_HAVE_NEON from qt.prfBenjamin Poulain2010-08-061-1/+4
| | | | | | | | | | | | | | | | 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 SIMD defines to the common declaration of Qt symbolsBenjamin Poulain2010-08-031-35/+2
| | | | | | | | | | | | | | | | 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 '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-031-0/+15
|\| | | | | | | | | Conflicts: configure
| * Add support for more vector instructions on x86Benjamin Poulain2010-07-201-0/+15
| | | | | | | | | | | | | | | | 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/+1
|\| | | | | | | | | | | | | Conflicts: src/gui/image/image.pri src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp
| * Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-1/+1
| | | | | | | | | | Task: QTBUG-11396 RevBy: Miikka Heikkinen
* | 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
* | Say hello to Qt for Native Client.Morten Johan Sørvig2010-05-141-1/+1
|/ | | | | | | | | | | | | | This commits adds build system to support for the native client compiler (x86-only for now), sets up global defines, and adds compile fixes for QtCore and QtGui. Details: * Add mkspecs for linux-nacl-g++ and macx-nacl-c++ * Add nacl configure option * Add qconfig-minimal-system-dependencies.h * Define Q_OS_NACL in qglobal.h * Add qnacalunimplemented.h/cpp with POSIX stubs. * .pro file changes for cross-compiling on Mac
* 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
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-011-0/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Benjamin Poulain2010-02-231-2/+16
| |\|
| * | Move the SIMD detection from QtGui to QtCoreBenjamin Poulain2010-02-231-0/+22
| | | | | | | | | | | | | | | | | | | | | The SIMD instructions are useful outside painting code, the common functions are moved to QtCore Reviewed-by: Samuel Rødal
* | | Corrected library locations for deployment on Symbian.axis2010-02-251-1/+1
| |/ |/|
* | Partial upgrade packages for QtCore and QtGuiShane Kearns2010-02-161-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Revert "Daylight savings time for Symbian take 2"Janne Koskinen2010-02-041-2/+0
|/ | | | This reverts commit 7bc18035816a2eac15dfac4d987eb9bf43f90ef6.
* Daylight savings time for Symbian take 2Janne Koskinen2009-12-281-0/+2
| | | | Second try to make this work for all S60 platforms
* Revert "Daylight savings time for Symbian."Janne Koskinen2009-12-231-2/+0
| | | | | | Reverted due to buildbreak on 3.2 ARMV5 Urel. This reverts commit 2a20705f874ddad55282f22fabfe30927729ae50.
* Daylight savings time for Symbian.Janne Koskinen2009-12-221-0/+2
| | | | | | | Ask DST from Symbian's timezone server. This commit makes datetime functions slower. Small room for optimisation with keeping the server connection always open. Task-number: QTBUG-6859 Reviewed-by: Aleksandar Sasha Babic
* Readd the Qt Evaluation timebomb, step 1.Thiago Macieira2009-10-291-1/+1
| | | | | | This is the QtCore part of the timebomb. Reviewed-by: Daniel Molkentin
* Merge commit 'qt/master'Jason Barron2009-08-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-171-0/+30
|
* Workaround for problems with paging Core and Sql libsMiikka Heikkinen2009-04-271-1/+7
|
* Long live Qt for S60!axis2009-04-241-0/+30
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 11:50:39 +0000