summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+1
| | | | | Task-number: QTBUG-14736 Reviewed-by: Alessandro Portale
* Cleaned up sis_targets.prfMiikka Heikkinen2010-12-021-48/+36
| | | | | | | | | | | Removed the unnecessary checks for the case where pkg file doesn't exist are no longer needed as we now have dependencies to pkg files and no sis creation targets are generated if pkg is not generated. Also improved documentation a bit and added the missing ok_installer_sis target generation. Reviewed-by: Janne Koskinen
* Updated language map in localize_deployment.prfMiikka Heikkinen2010-11-292-2/+33
| | | | | | | | Added missing Symbian language codes for which an Qt equivalent was available. Some codes were mapped to language/country pairs. Task-number: QTBUG-15293 Reviewed-by: Janne Koskinen
* Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-291-4/+11
| | | | | | | | | | Any application linking to QtNetwork, QtWebKit, or QtDeclarative is likely to utilize network, so add NetworkServices capabiltity for these applications by default in Symbian. Also increased the default epocheap maximum size for these applications. Task-number: QTBUG-14472 Reviewed-by: Janne Koskinen
* Fix symbian-mmp.conf include pathMiikka Heikkinen2010-11-222-3/+3
| | | | | | | | Use $$[QT_INSTALL_DATA] instead of $$[QT_INSTALL_PREFIX] when adding include path that points under mkspecs. Task-number: QTBUG-15501 Reviewed-by: axis
* Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-181-5/+2
|\ | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Enable OpenGL scissors testAdrian Constantin2010-11-151-3/+0
| | | | | | | | Reviewed-by: Petri Latvala
| * Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, ↵Petri Latvala2010-11-151-2/+2
| | | | | | | | | | | | add -Wno-psabi Reviewed-by: Adrian Constantin
* | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-128-19/+273
|/ | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila Reviewed-by: axis
* Fixed deployment for symbian/linux-armcc when using shadow builds.axis2010-11-082-4/+12
| | | | RevBy: Miikka Heikkinen
* Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-083-16/+21
| | | | | | | | | | | This commit also fixes the issue that 564058a1bb didn't, namely that config tests broke on Symbian. It does this by continuing to use the Open C libcrt0.lib library for non-Qt applications. This is also more correct, since you should not have to compile the Qt libs to compile a non-Qt app. Task: QTBUG-14735 RevBy: Miikka Heikkinen
* Make default application deployment removableMiikka Heikkinen2010-11-083-20/+40
| | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 494ce0dac35c7ade0ce78589878597a7ca912864 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: axis Conflicts: qmake/generators/symbian/symbiancommon.cpp
* Revert "Use qtmain.lib to provide entry point for all Symbian applications"axis2010-11-053-7/+19
| | | | | | | This reverts commit 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334. It breaks massively on the symbian/linux-armcc mkspec. Will find a different solution.
* Use qtmain.lib to provide entry point for all Symbian applicationsMiikka Heikkinen2010-11-043-19/+7
| | | | | | | | | Using Open C's libcrt0.lib to provide entry point caused problems for applications that launched other processes, as Open C retains a handle to all launched processes even after said processes terminate. Task-number: QTBUG-14735 Reviewed-by: axis
* msvc: enable unreferenced code elimination in release with debuginfo buildsOswald Buddenhagen2010-11-034-4/+4
| | | | | | | | | that linker optimization is on by default in release builds, so override /DEBUG implicitly turning it off. as it happens, this implicitly disables incremental linking, so that option can go away now. Reviewed-by: joerg Task-number: QTBUG-14007
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-181-0/+4
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Prepend epocroot to extra target tools if they start with /epoc32/ QS60Style: ComboBox disappears after orientation switch
| * Prepend epocroot to extra target tools if they start with /epoc32/Miikka Heikkinen2010-10-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to define extra targets and extra compilers commands that use tools under EPOCROOT without having to worry whether EPOCROOT contains drive letter or not, which is demanded by sbsv2 toolchain. For example, if command to be used is "%EPOCROOT%epoc32/tools/foobar.exe", the EPOCROOT should be omitted in .pro file and the command be given simply as "/epoc32/tools/foobar.exe". Reviewed-by: Janne Koskinen
* | qmake/symbian: Make sure the destination directory exists before copyingMartin Storsjo2010-10-181-1/+1
|/ | | | | | | | | | | cp on unix doesn't create the destination directory if it doesn't exist, as xcopy on windows does. This also requires QMAKE_MKDIR to use mkdir -p to be able to create directories recursively. Merge-request: 861 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-131-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages ...
| * use specified pkg-configMark Brand2010-10-111-3/+4
| | | | | | | | | | | | | | | | Respect the pkg-config tool specified in qmake.conf. This is useful when crossbuilding. Merge-request: 850 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Added --remove-destination to qmake_emulator_deployment.flmMiikka Heikkinen2010-10-131-1/+1
|/ | | | | | | This will fix the issue with deploying files when destination is owned by another user. Reviewed-by: TrustMe
* Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| | | | RevBy: Liang Qi
* Fixed missing QMAKE_MOC definition in certain mkspecs.axis2010-10-082-10/+8
| | | | | | | Also removed the use of DIR_SEPARATOR. It does not get defined until after symbian.conf has finished parsing. RevBy: Miikka Heikkinen
* Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.hMartin Jones2010-10-061-0/+1
| | | | Task-number: QT-3930
* Fixed library ordering when linking to qtmain.axis2010-10-041-2/+7
| | | | | Done-with: Liang Qi Reviewed-by: Trust me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-301-2/+22
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for unsigned smart installer package creation in Symbian Fix QApplication::desktop()->availableGeometry() for Symbian QS60Style: Possible NULL pointer use when drawing frame
| * Added support for unsigned smart installer package creation in SymbianMiikka Heikkinen2010-09-301-2/+22
| | | | | | | | | | | | | | | | | | Make target "unsigned_installer_sis" can now be used to create unsigned smart installer sis. The contained application sis will also be unsigned. Task-number: QTBUG-13902 Reviewed-by: axis
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-302-10/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Add declarative changelog entries for 4.7.1 connman backend My changelog entries for 4.7.1 updated changes-4.7.1 Update frameGeometry when the unified toolbar visiblity is toggled Update changelog my contributions to dist/changes-4.7.1 My 4.7.1 changes. added my and Jan-Arve's change to changelog for 4.7.1 Changes done for 4.7.1 Updated changes-4.7.1 My changes. Fix for bug QTMOBILITY-448 to list the default network configuration in Bearermonitor example Initialise pointer variables. An aborted QNetworkSession on Maemo must emit SessionAbortedError. Autotest: also enable testing of QtDeclarative Add Qt 4.7.0 baseline symbols to the 4.7 branch Call createpackage without the explicit .bat suffix Improve Qt/Symbian compatibility with unix shells Ukrainian translation updated ...
| * Call createpackage without the explicit .bat suffixMartin Storsjo2010-09-281-4/+4
| | | | | | | | | | | | | | | | | | | | On windows, the .bat file is implicitly called, on unix the "createpackage" shell script wrapper is called instead. The symbian-sbsv2 mkspec already calls createpackage without any suffix. Merge-request: 823 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Improve Qt/Symbian compatibility with unix shellsMartin Storsjo2010-09-281-1/+0
| | | | | | | | | | | | | | | | | | Remove an "echo." call that doesn't work on unix, and make the create_temps target work with unix shell syntax (QMAKE_CHK_DIR_EXISTS requires an || before the command to execute on unix shells). Merge-request: 823 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * fix moc argument quoting on mingwOswald Buddenhagen2010-09-281-5/+5
| | | | | | | | | | | | | | | | for some bizarre reason, mingw doesn't like double quotes. so instead of building some more elaborate custom quoting, just let qmake do it for us. Reviewed-by: mariusSO
* | Streamlined smart installer package creationMiikka Heikkinen2010-09-271-2/+2
|/ | | | | | | | | | | | Previously manual editing of the pkg file was required to publish application using smart installer. Now a proper app_installer.pkg will be created as long as application has protected range UID. Also changed "make installer_sis" to always generate the application sis as publishing process supports signing both application and its smart installer wrapper packages in single step. Task-number: QTBUG-13991 Reviewed-by: axis
* Improved Symbian4 platform detectionMiikka Heikkinen2010-09-231-26/+36
| | | | | | | | | | Now returns correct value for Symbian4 platforms with QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should also return correct value even if it doesn't get set in environment.prf. Task-number: QTBUG-13802 Reviewed-by: Shane Kearns Reviewed-by: Janne Anttila
* Qmake: Fix wrong path in the breakpad post link stepMarco Bubke2010-09-221-10/+9
| | | | Reviewed-By: Oswald Buddenhagen
* Update the ICC mkspec: keep the stack aligned to 16-byteThiago Macieira2010-09-221-1/+1
| | | | | | | | | | | | After discussing with Intel, turns out that ICC defaults to aligning the stack when it needs to (e.g., when issuing aligned operations), but doesn't care otherwise. GCC, on the other hand, expects the stack to always be aligned and will issue instructions without checking. We'll probably add __attribute__((force_align_arg_pointer)) to some functions in our code, but we won't be able to catch everything. Reviewed-By: Bradley T. Hughes
* qmake: fix quoting of moc callsJoerg Bornemann2010-09-211-2/+2
| | | | | Task-number: QTBUG-13782 Reviewed-by: ossi
* Add breakpad supportMarco Bubke2010-09-207-0/+105
| | | | | | | | | | Breakpad is a portable crash handler. It sends the raw crash information to a server for analysis. This analysis needs debug information. Consequently, we compile with debug info even in release mode if qt-breakpad integration is requested (via an environment variable). Reviewed-by: ossi
* Load environment.prf from Symbian SDK if it exists thereMiikka Heikkinen2010-09-171-22/+33
| | | | | | | | Environment.prf can contain SDK specific variable settings such as SYMBIAN_VERSION. Task-number: QT-3949 Reviewed-by: Janne Koskinen
* QTBUG-4852 Turning on runtime nested exception support where availablemread2010-09-162-0/+9
| | | | | | | | | | | | | | | | | | | | | Added nested_exceptions.prf to the symbian mkspecs features, and used it from the stl.prf config. nested_exceptions.prf adds the .mmp flag to use the nested exceptions runtime support library for apps. stl.prf will add nested_exceptions to the config when the support library is present. Since this check depends on the existence of the runtime support library when qmake is run, qtp will have to add nested_exceptions to their config when building with nested exception support. This change means that, where nested exceptions are supported on Symbian, apps will no longer crash if a nested exception is encountered at runtime. Task-number: QTBUG-4852 Reviewed-by: Miikka Heikkinen
* Merge branch 'buildSystemFixes' into 4.7-s60axis2010-09-142-16/+16
|\
| * Added support for using -L notation in the LIBS variable.axis2010-09-141-4/+10
| | | | | | | | | | Task: QTBUG-13523 RevBy: Thomas Zander
| * Eliminated duplicated code from library handling.axis2010-09-141-16/+10
| | | | | | | | RevBy: Trust me
| * Moved the sis_targets feature profile to the correct directory.axis2010-09-101-0/+0
| | | | | | | | RevBy: Trust me
* | 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-1 into ↵Qt Continuous Integration System2010-09-063-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits) make shadow builds not write into the source dir Fix failing tst_qmdisubwindow test after 71a3b1a0d3 Doc: update the documentation of QUrl about HTML Form encoding search translator comments Install translators earlier in assistant Fix compilation on ARM: don't include kernel headers Fix compilation of qmake with MSVC Doc: Updating known-issues page. Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-033-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp ...
| | * Add option to enable -MP compile option for MSVCMarius Storm-Olsen2010-09-023-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option is on when building Qt, but off by default for other projects, due to potential incompatible compile options in other projects. (/E, /EP, /Gm, /Yc, /showIncludes, #import preprocessor directive) Reviewed-by: bhughes Reviewed-by: ossi
* | | Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2Miikka Heikkinen2010-09-061-0/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No longer require PRE_TARGETDEPS items to be absolute, which was difficult to achieve sometimes as qmake doesn't provide method for absolutizing paths. - Do smart command replacement for commands containing $$QMAKE_* command variables, such as $$QMAKE_COPY, when generating bld.inf extensions for QMAKE_EXTRA_* variables. $$QMAKE_* command variables cannot be passed to sbsv2 toolchain directly, as it uses cygwin in windows, and they can't simply be replaced to use sbsv2 equivalents in symbian.conf, because generated wrapper makefiles need them to be Windows compatible. Reviewed-by: axis
* | Fix Symbian handling of projects with special characters in TARGETMiikka Heikkinen2010-09-035-63/+70
|/ | | | | | | | | Plenty of filenames got generated with spaces which didn't work as that was not taken into account. Harmonized TARGET fixing across prf files and qmake Symbian generator code. Task-number: QTBUG-13363 Reviewed-by: Thomas Zander
* QT_PLUGINS_BASE_DIR needs to be defined after load(qt_config)Miikka Heikkinen2010-09-011-1/+2
| | | | | | | QT_LIBINFIX is defined in qconfig.pri, so qt_config needs to be loaded before that is used. Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-12-28 21:41:56 (GMT)