summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-302-7/+1
|\ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/3rdparty/webkit/WebCore/WebCore.pro
| * Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-261-0/+1
| | | | | | | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-252-8/+2
| |\ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-252-3/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
* | \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-292-4/+17
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * | | Enable armcc version specific compler options for SymbianMiikka Heikkinen2010-03-261-1/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VERSION_FLAGS.ARMCC variable is used in symbian.conf to define supported armcc compiler version flags. Values given to this variable must be directly usable as ifdef flags in mmp. QMAKE_CXXFLAGS.<version flag> variables can now be used to add compiler options to specific compiler versions. Note that options added via QMAKE_CXXFLAGS.ARMCC flag will apply to all versions of armcc compiler. Task-number: QTBUG-8685 Reviewed-by: Iain
| * | Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-242-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-232-8/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits) Fix the test of QDirIterator with NoDot and NoDotDot Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot QFSFileEngine: don't look through NTFS junctions After showing modal windows, WM_LBUTTONUP for double click is ignored. Possible fix for missing QML properties in the qt.qhp file. Use standard theme icons in Linguist where possible Use more standard icons from the theme in Assistant Use more standard icons for standard actions in Designer Drag & drop operations wont end while using Remote Desktop sessions _close(fd) closes the associated handle and not the other way around Fixed locale mapping on Symbian. Revert change 7bf4512659 on Cocoa. Extended the high_attributes array, since we have more than 127 widget attributes now. Added instructions for MinGW users wanting to build the MySQL driver. Designer: Fix broken resource view. Add missing ,. get rid of build warning messages Quiet unnecessary configure/qmake warnings when EPOCROOT is not set. Add configure test for Maemo Internet Connection Daemon. fix warning ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-222-8/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits) Moc: Add support for rvalue references in signals and slots. Add support for polyphonic greek Fix build failure on WinCE. Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-212-8/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits) Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors Dont force height for filter widget - Fix importdir option on unix/linux configure Remove incorrect semi-colons after Q_PROPERTY ...
| | | * \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-1934-357/+1023
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | * | | Add flag to indicate that network sessions are expected on a platform.Aaron McCarthy2010-03-182-6/+0
| | | | | |
| | | * | | Bugfix the Symbian implementationThiago Macieira2010-03-171-2/+2
| | | | | |
* | | | | | Fixed mif generation on symbian-abld.axis2010-03-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to do backslash fixing because we are using QMAKE_EXTRA_TARGETS instead of QMAKE_EXTRA_COMPILERS, which in turn is needed to get clean targets correct on the symbian/* mkspecs.
* | | | | | Fixed regular expression matching.axis2010-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need extra backslashes, otherwise it tries to match the '|' verbatim.
* | | | | | More fool proof way for finding these headersThomas Zander2010-03-231-1/+1
| | | | | |
* | | | | | Make ICON generation (to symbian mif) work for relative paths/shadow buildsThomas Zander2010-03-221-0/+2
|/ / / / /
* | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-224-4/+8
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * | | | Change fromSymbianRSgImage() to use the newer version of RSgImageJason Barron2010-03-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian have changed the implementation of RSgImage to be more lightweight and have moved it to a new library. This patch changes Qt's usage of RSgImage to the new version and fixes some minor code style issues. Reviewed-by: Aleksandar Sasha Babic
| * | | | Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-183-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* | | | | Switched out QT_SOURCE_TREE, which is not defined for user apps.axis2010-03-221-1/+1
| |/ / / |/| | |
* | | | Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusionMiikka Heikkinen2010-03-191-7/+8
| |_|/ |/| | | | | | | | | | | | | | | | | | | | $${DIR_SEPARATOR} wasn't yet declared in the previous place. This was only a problem for projects built outside Qt tree, as .qmake.cache also redefined these variables. Reviewed-by: axis
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-181-0/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: qmake/generators/symbian/symmake_abld.cpp
| * | Make sure target path exists in qmake_extra_pre_targetdep.flmMiikka Heikkinen2010-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since newer versions of Raptor delete all empty parent directories when cleaning up the files, qmake created moc output directories get also deleted when sbs clean is invoked. Fixed by always creating the extra compiler target directory during build. Task-number: QTBUG-6795 Reviewed-by: Janne Koskinen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-1733-357/+1021
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits) Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always Enabled dependencies for .dso and .lib libraries only. Switched to using DEF_FILE, which is the official variable. ...
| * | Fixed Symbian applications with DESTDIR set.axis2010-03-161-1/+1
| | |
| * | Removed a warning about generated rss files.axis2010-03-162-28/+53
| | | | | | | | | | | | | | | | | | Also cleaned up the "clean" and "distclean" targets a bit. Task: QTBUG-8854
| * | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-168-0/+21
| | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | Enabled compilation of plugins again.axis2010-03-162-0/+2
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-165-57/+134
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
| * | | Fixed a building bug where the DLL entry point was undefined.axis2010-03-153-2/+3
| | | |
| * | | Moved UID2 processing from cpp code to profiles.axis2010-03-151-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | This enables it to be used by all Symbian build systems. RevBy: Miikka Heikkinen
| * | | Moved two profiles to the correct directory.axis2010-03-112-0/+0
| | | | | | | | | | | | | | | | This gets applications building again.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1174-3/+83
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | | | Use the same concept for per-lib tweaks as armccThomas Zander2010-03-091-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Symbian doesn't have large file support currently, just turn it offThomas Zander2010-03-091-0/+2
| | | | |
| * | | | Make sure that we have all compile flags available alwaysThomas Zander2010-03-097-46/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users may do a CONFIG -= qt which means that the qt.prf won't be loaded. So, lets make sure we don't have any critical properties in those files.
| * | | | Enabled dependencies for .dso and .lib libraries only.axis2010-03-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for .lib files, as well as removes support for all others than .dso and .lib. This builds on the original commit bdff51768dfe.
| * | | | Merge branch 'defFilesAndMisc'axis2010-03-083-48/+123
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian-makefile.conf mkspecs/symbian/features/symbian_building.prf
| | * | | | Added Symbian def file support to Linux build system.axis2010-03-083-26/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also switches the official def file variable in qmake profiles to DEF_FILE. Support for freezing def files was also added, but needs more work and is therefore disabled for now. Task: QTBUG-7510 Task: QTBUG-8052
| | * | | | Enabled conditional updating of dso files.axis2010-03-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves rebuilding of components that depend on the current one, by not updating the dso file unless it has changed.
| | * | | | Added dso dependencies to Symbian targets.axis2010-03-021-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for correct intermodule building when def files are off, since otherwise the ordinals present in the DLLs and the ordinals linked to may be different. In layman's terms: If you build QtCore, QtGui will also trigger rebuilding as a result of that.
| | * | | | Reversed order of user QMAKE_POST_LINK statements and generated ones.axis2010-03-021-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the users' statements would run before the binary was fully linked.
| * | | | | Make the symbian_building.prf be shared fileThomas Zander2010-03-027-251/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the fork I made for gcce is similar enough to now be shared between gcce and armcc so move stuff around a bit to avoid the code duplication.
| * | | | | Merge branch 'master' into gcceThomas Zander2010-03-0219-242/+205
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-019-17/+73
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Corrected a wrong comment.axis2010-02-261-1/+1
| | | | | | |
| | * | | | | Removed restrictions on file names from the Symbian makefile system.axis2010-02-262-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spaces in filenames still won't work, but that is very tricky to fix because you cannot escape filenames inside the QMAKE_EXTRA_COMPILERS section. Task: QTBUG-8555
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-238-218/+125
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
| * | | | | | | Properly get the paths for the compiler-provided libsThomas Zander2010-03-022-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I call g++ to tell me the library paths for the compiler so I can pass that on to ld. I'm a bit confused why this is needed, need to find out if thats expected behavior for gcce