summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-282-4/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add missign license headers. Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian. Make link on linux/symbian Fix double slashes on few data caging paths Fix for QRuntimePixmapData serial number setting. Enable QTouchEvent for S60 5.0 Add missing license header. Fix build error on S60 3.1 environments QRuntimeGraphicsSystem Fix replacement functions in platform_paths.prf
| * Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-2717-44/+44
| |\ | | | | | | | | | | | | Conflicts: src/plugins/bearer/symbian/qnetworksession_impl.h
| * | Fix double slashes on few data caging pathsMiikka Heikkinen2010-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | | QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR paths had double slash in front of them. Reviewed-by: Janne Koskinen
| * | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-215-1/+14
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h
| * | | Fix replacement functions in platform_paths.prfMiikka Heikkinen2010-05-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clearing epocroot_prefix at the end of the file caused it to be empty at the time replacement functions were resolved. Reviewed-by: Janne Koskinen
* | | | fix escaping - by not using evalOswald Buddenhagen2010-05-271-3/+3
| |_|/ |/| | | | | | | | | | | the left-hand-side of qmake assignments is expanded, so there is no need to use eval.
* | | escape quotes meant for the shellOswald Buddenhagen2010-05-261-1/+1
| | |
* | | escape backslashesOswald Buddenhagen2010-05-2616-43/+43
| |/ |/| | | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-215-1/+14
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-215-1/+14
| |\
| | * Fix WebKit version dependency in pkg filesSimon Hausmann2010-05-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the Qt major/minor/patch version for WebKit, but use them only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is read by qt.prf Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | * 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>
| | * fix qmake -project once moreOswald Buddenhagen2010-05-183-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | default_pre.prf adds "uic" and "resources" to CONFIG, but not "qt". as a consequence, the former do not find qtPrepareTool(), as nobody includes qt_functions.prf if no qmake spec is loaded. Reviewed-by: joerg
* | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-199-32/+21
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-191-2/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: removed test file, part of mediaservice removal. Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-182-16/+29
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| | * | | Removed mediaservices.Kurt Korbatits2010-05-181-2/+1
| | | | |
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-178-30/+20
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| | * | fix regexpOswald Buddenhagen2010-05-141-1/+1
| | | |
| | * | define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-148-30/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* | | | Make the 'freeze' target work for linux/symbian.Thomas Zander2010-05-191-3/+3
| | | | | | | | | | | | | | | | | | | | Users can type 'make freeze' to get the def files updated right in the git source tree
* | | | Fix generation of stub sis filesShane Kearns2010-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert paths in DEPLOYMENT to the rom drive (z:) Filter out unwanted parts of the header (dependencies) Task-number: QTBUG-10118 Reviewed-by: Alessandro Portale
* | | | Re-enable suppression of --export_all_vtbl for static librariesIain2010-05-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert fix for QTBUG-10680 - the reasoning in the original fix was wrong. Internal typeinfo and vtable exports should be suppressed even for static libraries, as these will leak through into the final DLL when it links against that static lib (my testing at the time must have been faulty, as I thought I had found that they didn't). This change may cause problems if anyone has already frozen (internal) TI and VT symbols into their DEF files through linking with a static library. However, it should be perfectly safe to mark those symbols as ABSENT in the DEF file. An alternate solution must be found for QTBUG-10680. Task-number: QTBUG-10678 Reviewed-by: Alessandro Portale
* | | | Add 'runonphone' target for symbian / makefileThomas Zander2010-05-121-0/+9
|/ / / | | | | | | | | | | | | | | | This new target simply takes a sis file and runs the app on phone. Reviewed-by: Shane Kearns
* | | Run autotests with minimal capabilitiesShane Kearns2010-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotests were previously run with ALL-Tcb capability which gives them more access to the filesystem etc. than a typical Qt application. To have more realistic testing environmnent, tests are run with no capabilities other than those required for the Qt APIs they use. i.e. NetworkServices for network tests, None for others. Reviewed-by: Liang Qi
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-031-15/+28
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| * | Removed the --export_all_vtbl from linking.axis2010-05-031-2/+4
| | | | | | | | | | | | | | | | | | It causes wrong exports. This required rearranging some libraries to avoid undefined symbols.
| * | Cleaned up the elf2e32 options a bit.axis2010-05-031-13/+24
| | |
* | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-05-031-2/+2
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-023-12/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) bye bye QMakeProjectEnv short-cut evaluation inside if() tests eliminate special splitting of INCLUDEPATH and DEPENDPATH do not env-expand cache file path s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ s/INCPATH/INCLUDEPATH/ s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/ teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH) warn about usage of deprecated variables warn about using non-lowercased replace $$function()s add -Wdeprecated option (on by default) make QMakeProject::isEmpty() consider legacy mappings document some functions' scope fix $$size() not using function-scoped variables doc: Fixed some qdoc errors. qdoc: Added breadcrumbs for namespaces. Autotest: check that we receive key events on toplevel widgets Cocoa: key events stopped working Update Polish translations qdoc: Added "All namespaces" to the API Lookup box. ...
| * | bye bye QMakeProjectEnvOswald Buddenhagen2010-04-301-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake variables would have been exported to the command run by $$system() and - optionally - to the command run by system(). however, this was a unix-only feature and made the kernel barf at the huge environment on older linuxes. as we don't like platform-specific hacks which are unreliable, in particular when a workaround exists (the commands execute shell code after all, so one can inject arbitrary env variables), just blow it away - it was undocumented, after all. Reviewed-by: joerg
| * | Added wildcards to allow custom mkspecs namesConstantin Makshin2010-04-292-2/+2
| | | | | | | | | | | | | | | Merge-request: 2374 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Fix desktopservices demo missing icon in SymbianMiikka Heikkinen2010-04-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian abld toolchain cannot handle very long paths for mifconv source images, so do not absolutize the path. This should not be a problem, as the absolute icon path is only needed for shadow builds, which are not supported in symbian-abld anyway. Task-number: QTBUG-10135 Reviewed-by: Thomas Zander
* | | Make 'make sis' recursive again.Thomas Zander2010-04-291-1/+1
| | | | | | | | | | | | | | | After default_deployment was added as default option our test for project type was not reached anymore. Fix that.
* | | Make symbian-resource files aware of libInfix configure featureThomas Zander2010-04-291-3/+3
|/ /
* | fix nmake build with win32-msvc2010Joerg Bornemann2010-04-262-2/+2
| | | | | | | | Reviewed-by: Martin Petersson
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-181-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| * | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-1/+1
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-1/+2
| | |
* | | Fix check for arm based systemsThomas Zander2010-04-161-2/+2
|/ / | | | | | | The lib is only on the phone, so check the dso file instead.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-142-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits) Revert "Removed double setting of _WIN32_WINNT" Revert "removed a few warnings on wince builds" removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER ...
| * \ Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-121-12/+29
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/ds9/mediaobject.cpp
| * | | Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.Dominik Riebeling2010-04-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the configuration option "-config silent" building on MinGW fails due to the use of the backslash as path delimiter. Using DIR_SEPARATOR instead of the hardcoded delimiter (like done for MOC) fixes this. Reviewed-by: aavit Merge-request: 1697 Reviewed-by: aavit <qt-info@nokia.com>
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-131-2/+8
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | 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
* | | Make compiling / linking a non-qt app work too on symbian/gcceThomas Zander2010-04-081-5/+13
| | |
* | | Fix library creation on symbian/gcceThomas Zander2010-04-071-0/+1
| | |
* | | Various fixes for symbian/gcce building.Thomas Zander2010-04-071-12/+20
| |/ |/|
* | Fix qmake with the symbian makespec failing when project has a dash in itThomas Zander2010-03-301-2/+2
| |
* | Fix out-of-source symbian build for external appsThomas Zander2010-03-301-1/+1
| |
generated by cgit v0.12 at 2024-10-27 18:30:55 (GMT)