summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Windows: Add gcc 4.6.Friedemann Kleint2011-11-161-1/+1
| | | | | | | - Add gcc 4.6 mkspec for > 4.4 (win32-g++-4.6) - Add detection of g++ version and 64bit to configure. Reviewed-by: mariusSO
* Add INTEGRITY gbuild.* files to qmake project.Rolland Dudemaine2011-11-152-2/+5
| | | | | | | This allows building and debugging qmake from Qt Creator. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use the project root from .gpj project files, instead of local path.Rolland Dudemaine2011-11-151-3/+5
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Make sure QMAKE_CXX is defined to prevent crashing on some projects.Rolland Dudemaine2011-11-151-1/+3
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Add support for .pro-type subdirectories.Rolland Dudemaine2011-11-151-1/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Add relative path to the work directory, to prevent filename clashes.Rolland Dudemaine2011-11-151-0/+4
| | | | | | | | This was causing issues for some examples, which are all consistently using main.cpp as the entry file. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Only call moc if the file needs it.Rolland Dudemaine2011-11-151-2/+3
| | | | | | | | | This applies to both headers and cpp files (use mocable()). Previously, moc was called on all cpp and h files, causing additional compilation time, and trouble on QSvgGenerator. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use outname to specify the output .gpj to generate.Rolland Dudemaine2011-11-151-3/+3
| | | | | | | | | This resolves several path issues as well. outname itself is now based on the first TARGET file, instead of using the output filename. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Use "dll" instead of "shared".Rolland Dudemaine2011-11-151-1/+1
| | | | | | | | | | For DLLs (which are not supported, but may be soon), use the CONFIG variable "dll" instead of the "shared" template, because some testcases actually use shared even when compiled statically. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Instead of translating / into _, check if subdir is a .pro.Rolland Dudemaine2011-11-151-2/+4
| | | | | | | | | | Previously, .pro files were treated as directories, and a previous workaround for the issue was to replace / with _ in directory paths. This was both actually non-sensical and not effective. This resolves the issue by checking if the subdir has a .pro extension. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Do not generate -D defines for project types.Rolland Dudemaine2011-11-151-1/+2
| | | | | | | | | | | Options are implicitly inherited from project to subprojects and applications, so there is no need to respecify them. Worse, if an app/lib disables an option, the project might still have the define enabled, forcing it also onto the app/lib. This prevents double-define or this kind of conflict. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Clean up generated linker file for the shared library case.Rolland Dudemaine2011-11-151-9/+11
| | | | | | | Generated linker file was not looking good, now much better. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Make applications start by default (StartIt True).Rolland Dudemaine2011-11-151-0/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Change the overload from write() to writeMakefile() in INTEGRITY generatorRolland Dudemaine2011-11-152-2/+2
| | | | | | | | This way, INTEGRITY-specific generation is only called in Makefile mode. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-10-181-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: qmake: fix writing of incremental linker option for vcxproj files
| * qmake: fix writing of incremental linker option for vcxproj filesJoerg Bornemann2011-10-141-1/+1
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-171-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (35 commits) runonphone timestamps nanosecond formating set to 9 chars, 0 padded Put Qt translation files to rom on Symbian. Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian Converting from double to qreal in gui Fix XML schema validation failure. Fix construction races in QtNetwork Removing accidental use of double instead of qreal from QLine Fix incorrect QFileInfo permissions on windows Converting accidental use of doubles to qreal in declarative Copy and Cut are not available for some QML editors Ignore CcpuCan calls if input context is being destroyed Remove one local variable from QCoeFepInputContext Symbian: Fix native dialog with splitscreen VKB focus loss issue Create auto test for http HEAD request QNAM - fix poor performance of HEAD request with authentication runonphone - Implement CODA autodetection Symbian: Parse ts filenames case-insensitively for localize_deployment Do not crash in copy() of pixmaps without an underlying bitmap QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8 symbian - document behaviour of QFile::handle() ...
| * \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-142-7/+3
| |\ \ | | |/
| * | Symbian: Parse ts filenames case-insensitively for localize_deploymentMiikka Heikkinen2011-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of platform applications have all-lowercase translation files due to file naming policies. This makes no difference for runtime translation, so removed unnecessary case sensitivity when parsing ts filenames for localization deployment. Task-number: QT-5305 Reviewed-by: Sami Merila
| * | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-202-58/+5
| |\ \
* | | | support the obj-c #import statement in the dependency generatorOswald Buddenhagen2011-10-141-1/+2
| |_|/ |/| | | | | | | | | | | Task-number: QTBUG-21965 Reviewed-by: joerg
* | | Add -nn for .cpp MOC preprocessing for INTEGRITYRolland Dudemaine2011-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake generates .gpj project files for INTEGRITY. Calls to moc on headers or code that do not produce actual output cause a Note to be generated. This is considered as an error during build by the Green Hills gbuild build tool. -nn can be added to not generate that note when no output is generated. This was already done for headers in util/integrity/qt.bod, but it was not there yet for .cpp files. Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Remove commented out code.Rolland Dudemaine2011-10-121-7/+0
| | | | | | | | | | | | | | | Merge-request: 2693 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | add integrity gbuild to the project file for convenienceOswald Buddenhagen2011-09-291-0/+2
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-09-201-35/+28
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits) runonphone: Include USB serial ports on OS X for CODA, too runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp Fix panic when global QSettings instance needs flusing at app exit Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Fix "sbs -c tools2 --what" output for Qt. Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name runonphone: Allow overriding the temporary sis file name Fix QIcon auto-tests for Symbian Add a cast to moc cpp generator to remove armcc warnings Fix qt.conf for Symbian to use $${EPOCROOT} Remove few unused variables. ...
| * Remove few unused variables.Miikka Heikkinen2011-09-061-2/+0
| | | | | | | | | | | | | | The languageAttribute and underscoreChar variables were not used in SymbianCommonGenerator::parseTsContent function, so removed them. Reviewed-by: TrustMe
| * Symbian: Detect app caption and pkg name translations by id attribute.Miikka Heikkinen2011-09-061-33/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To better support various localization tools, added an alternate way to detect application caption and package name translations in .ts files. Now in addition to specific source text the id attribute of the message element can be used to identify interesting translations. The ids qmake is looking for are: qtn_short_caption_<appname> qtn_long_caption_<appname> qtn_package_name_<appname> qtn_smart_installer_package_name_<appname> Task-number: QT-5247 Reviewed-by: Sami Merila
| * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-312-2/+2
| |\
* | \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-101-56/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: find qt.conf more reliably
| * | | find qt.conf more reliablyOswald Buddenhagen2011-09-091-56/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | a qmake invoked with a relative path would not find qt.conf, because it already changed CWD, which would confuse our copy of QCoreApplication::applicationFilePath() (see also QTBUG-21381). we already have the absolute path to the qmake executable in Option::qmake_abslocation, so just use it.
* | | qmake vcxproj generator: fix XML conversion for build eventsJoerg Bornemann2011-09-081-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-20419 Reviewed-by: ossi
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-08-316-34/+34
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Symbian system date format parsing. Fix QXmlSimpleReader auto test failer Fix pointer event mapping when windows are fixed to native orientation Fix incorrect Symbian version check. Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds. Improved support for shadow builds in Symbian. Fix def file paths for Symbian shadow builds Giving QUuid::createUuid() more entropy on Symbian Enable running of XQuery test suite QXmlSimpleReader handle external entity reference file over 1k
| * Improved support for shadow builds in Symbian.Miikka Heikkinen2011-08-246-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | It is now possible to make shadow builds in Symbian. Note that any relative host side paths specified via BLD_INF_RULES, MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted to point to build directory. Task-number: QTBUG-10432 Rubber-stamped-by: ossi Reviewed-by: TrustMe
* | Added missing no_include_pwd checkStyopa Semenukha2011-08-181-1/+1
| | | | | | | | | | Merge-request: 2619 Reviewed-by: ossi
* | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-181-1/+1
|/ | | | | Merge-request: 1299 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
| * Ignore child elements in non-application caption/pkg name translationsMiikka Heikkinen2011-08-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian, when parsing .ts files for deployment localization, qmake would break if there was any translation using lengthvariants inside QtApplicationCaptions context. Technically this is legal though QtApplicationCaptions context is only meant for application captions and we don't support lenghtvariants for the actual captions themselves. Changed parsing so that any child elements on translations are simply skipped instead of causing parsing errors. Task-number: QT-5169 Reviewed-by: Guoqing Zhang
| * Update licenseheader text in source filesJyri Tahtela2011-05-1353-901/+901
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | qsystemlibrary needs no special treatmentOswald Buddenhagen2011-06-241-3/+0
| | | | | | | | this was just a merge artifact
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: trivial: fix typo in comment changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver disable the Embedded Linux data directory permissions check for QNX skip two subtests that are known to fail on QNX implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends implement POSIX IPC based QSystemSemaphore and QSharedMemory backends add a configure-time check for an IPC support make QProcess really work on QNX make the kernel attempt to emulate an instruction with a misaligned access use RoundRobin scheduler by default on QNX a major refactoring of the mkspecs tree for QNX buildfix for qmake
| * | buildfix for qmakeRitt Konstantin2011-06-211-1/+1
| | | | | | | | | | | | | | | Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-212-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Adding debug output for not supported gl features Compile fix in network for ios Make it possible to compile in a screen plugin name in QWS Don't redefine EGL defines Compile fixes in corelib for ios Export IPHONEOS_DEPLOYMENT_TARGET from qmake Adding arm armv6 and armv7 as valid archs for mac builds reset certain global variables on deletion Made tst_QWidget::repaintWhenChildDeleted() pass.
| * | | Export IPHONEOS_DEPLOYMENT_TARGET from qmakeIan2011-06-202-0/+6
| |/ / | | | | | | | | | Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2455-999/+1046
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-05-202-4/+42
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Increased EPOCHEAPSIZE for qpainter benchmark Increased EPOCHEAPSIZE for few benchmarks Update Symbian DEF-files Improve DEFINES crossplatform compatibility in Symbian builds. Freezing the QtCore defs again for 4.8.
| | * | Improve DEFINES crossplatform compatibility in Symbian builds.Miikka Heikkinen2011-05-162-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEFINES statements that define strings needed separate statements for symbian-sbsv2 builds and Makefile based plaforms, as there is one extra layer of escaping needed in Makefile builds. Improved compatibility by making qmake remove one layer of escaping before writing the .mmp MACROs based on DEFINES. Note: Symbian-abld builds still do not support string DEFINES as the toolchain simply can't handle them in .mmp files, no matter how they are escaped. Note2: Symbian-sbsv2 support for escaped DEFINES is not perfect either, as bld.inf files do not like doubly escaped characters in extension rules (e.g. double-quotation mark as part of a string). This makes it impossible to pass such DEFINES to extra compilers. Task-number: QTBUG-19232 Reviewed-by: Oswald Buddenhagen
| * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-5/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| | * \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-171-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (55 commits) Fix thread safety regression of QNetworkConfigurationManager Fix instability in QNetworkConfigurationManager autotest Support word selection list with predictive text from splitview Fix softkey icon positioning in S60 5.3 QDeclarativeMouseArea: block context menu events ListViews loses items if all visible items are removed. Make TextEdit word selection more natural. Clear confusion between QMainWindow and QMainWindowLayout. Fix for rounded corners bug in QMenu Compile QWidgetPrivate::setParent_sys might be using null pointer Ensure the TextEdit cursor delegate is repositioned on mouse events. Don't crash on an invalid replacementStart from an input method. Fix incorrect hardware address on systems without getifaddrs() Enable multisampling on Symbian if hw supports it Fix QtCoreu.def file error Introduce platform extension to QGraphicsSystem Fix Symbian/WinsCW build break Prevent crash in OpenGL engine when scaling images / pixmaps. emit QNetWorkAccessManager::finished on QNetworkReply::abort() ...
| | | * \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-168-51/+41
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qt_s60_p.h
| | | * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-061-1/+1
| | | |\ \ \ | | | | | |/ | | | | |/|
generated by cgit v0.12 at 2024-12-27 13:30:05 (GMT)