summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-061-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits) mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior configure: Deal with multiple redefinitions of qmake variables Split QScriptValue::call autotest into smaller tests. Optimize and clean up QClipData::fixup() There is no predefined qmake x11 scope for x11 builds. Refactor tst_QScriptContext::throwError test. Fixed whitespace. Don't use scopes in mkspecs as configure does not support them Fixed destination path for the S60 feedback plugin. Don't put Objective-C sources in SOURCES Fix regression in tst_maketestselftest::naming_convention. Split monolithic QScriptEngine autotests into smaller tests Add SunSpider and V8 benchmarks to benchmarks/script.pro Push and pop the thread-default context for the current thread Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined. Import SunSpider benchmarks for QtScript Import V8 benchmarks for QtScript Add more microbenchmarks for QScriptValue ...
| * There is no predefined qmake x11 scope for x11 builds.Robert Griebl2010-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | All the autotests that are using a x11{} scope to add QMAKE_LIBS_X11 to LIBS are actually not adding anything at all, but just happen to build correctly because the standard GNU ld resolves symbols in shared libraries recursively (and libQtGui depends on all those X libs already). Building those tests with GNU gold will lead to undefined X* symbols, since gold doesn't use implicitly dependant libs to resolve symbols. Reviewed-by: Harald Fernengel
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-052-18/+5
|\ \ | |/ |/| | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * Use qtmain.lib to provide entry point for all Symbian applicationsMiikka Heikkinen2010-11-042-18/+5
| | | | | | | | | | | | | | | | | | 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
* | Fix some build issues for building Qt for Symbian on Mac OS X.Liang Qi2010-10-271-0/+1
| | | | | | | | | | | | Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927. RevBy: axis
* | Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-264-27/+57
|\ \
| * | Got rid of some "duplicate library" warnings.axis2010-10-211-1/+1
| | | | | | | | | | | | RevBy: Trust me
| * | Changed various qmake constructs to support Windows.axis2010-10-212-9/+28
| | | | | | | | | | | | RevBy: Thomas Zander
| * | Fixed various quotation problems when porting to Windows.axis2010-10-211-6/+11
| | | | | | | | | | | | | | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
| * | Fixed some preprocessor parameters for Mac support.axis2010-10-211-4/+4
| | | | | | | | | | | | RevBy: Liang Qi
| * | Added detection of bat files to the qtPrepareTool function.axis2010-10-211-1/+7
| | | | | | | | | | | | | | | | | | Not all tools end with .exe. Some also end in .bat. RevBy: Oswald Buddenhagen
| * | Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-212-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander
| * | Fixed library ordering when linking to qtmain.axis2010-10-211-2/+7
| | | | | | | | | | | | | | | Done-with: Liang Qi Reviewed-by: Trust me
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-3/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | 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>
* | | Handle Objective-C/C++ sources in SOURCES gracefullyTor Arne Vestbø2010-10-201-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We look though SOURCES for Objective-C/C++ source files and if we find any we warn the user and move the offending file to OBJECTIVE_SOURCES. We also don't generate implicit rules for .mm files anymore, since that's not supported by qmake and will break in mysterious ways. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | Merge branch '4.7-s60' into master-s60axis2010-10-081-4/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp
| * | Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| | | | | | | | | | | | RevBy: Liang Qi
* | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-086-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-072-20/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Implement support for DEPLOYMENT.display_name in Symbian Added .flags modifier support for DEPLOYMENT items in Symbian Make default application deployment removable
| * | | Make default application deployment removableMiikka Heikkinen2010-10-072-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. Task-number: QTBUG-13367 Reviewed-by: axis
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-2/+7
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * | Fixed library ordering when linking to qtmain.axis2010-10-041-2/+7
| | | | | | | | | | | | | | | Done-with: Liang Qi Reviewed-by: Trust me
* | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-042-14/+33
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-10/+9
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Qmake: Fix wrong path in the breakpad post link stepMarco Bubke2010-09-221-10/+9
| | | | | | | | Reviewed-By: Oswald Buddenhagen
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-222-2/+90
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
| * qmake: fix quoting of moc callsJoerg Bornemann2010-09-211-2/+2
| | | | | | | | | | Task-number: QTBUG-13782 Reviewed-by: ossi
| * Add breakpad supportMarco Bubke2010-09-201-0/+88
| | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-215-17/+27
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * 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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-101-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix typos. Fix typo in declative example. test for gdb version before runnning dwarf indexing Fix Core Text font loading for certain Mac Fonts Support sub pixel positioning of glyphs in raster engine Added basic tests for threaded QPainter drawing onto FBOs and PBOs.
| * | test for gdb version before runnning dwarf indexingArvid Ephraim Picciani2010-09-101-0/+1
| | | | | | | | | | | | Reviewed-by: ossi
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-109-86/+74
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-031-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix Symbian handling of projects with special characters in TARGETMiikka Heikkinen2010-09-034-63/+52
| |/ | | | | | | | | | | | | | | | | 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
| * make various POST_LINK steps nicerOswald Buddenhagen2010-08-315-23/+14
| | | | | | | | | | | | | | put each step into a separate make command. that makes for cleaner output and less troubles with command separators. Reviewed-by: mariusSO
generated by cgit v0.12 at 2024-11-12 15:02:22 (GMT)