summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | don't ignore create_prl for static pluginsOswald Buddenhagen2011-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18436 Reviewed-by: joerg
| | * | | | Merge remote branch 'origin/4.8' into qa-review-masterRohan McGovern2011-05-1528-209/+249
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qaccessibility/tst_qaccessibility.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| | * | | | Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefileRohan McGovern2011-05-121-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make. This would break in the case where the correct makefile was not named `Makefile'. The included autotest demonstrates the problem. Note that this was fixed for normal targets back in 2005 by faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not fixed for extra targets. Reviewed-by: ossi
| * | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1355-937/+937
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-05-118-51/+41
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e qmake vc(x)proj generator: support x64 Qt builds qmake: remove dead code from VcxprojGenerator qmake nmake generator: pass MAKEFLAGS to sub-make calls
| | * | | fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76eJoerg Bornemann2011-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | qmake vc(x)proj generator: support x64 Qt buildsJoerg Bornemann2011-05-062-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17911 Reviewed-by: ossi
| | * | | qmake: remove dead code from VcxprojGeneratorJoerg Bornemann2011-05-062-28/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
| | * | | qmake nmake generator: pass MAKEFLAGS to sub-make callsJoerg Bornemann2011-05-054-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other make tools nmake doesn't do this automatically. Reviewed-by: ossi
| * | | | qmake: Introduce new template typeChristian Kandeler2011-05-034-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point). Reviewed-by: Joerg Bornemann
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-037-57/+84
|\ \ \ \ \ | |/ / / /
| * | | | Fix wrong merge of 3aa39b0164ce4bb9eOlivier Goffart2011-04-191-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-187-56/+83
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| | * | | look for makespec in the build dir firstOswald Buddenhagen2011-04-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's more natural to look into the build dir before the source dir, and it's what the qmake-generated makefiles mean when re-invoking qmake. specifically, this works around the problem that relative paths with excess ".."s pointing below the root are happily ignored and thus truly bizarre makespec paths may be constructed by the qmake re-invocations if the source dir is less nested than the build dir. Task-number: QTBUG-9817 Reviewed-by: mariusSO
| | * | | make collection of SUBDIRS in solution generator less bizarreOswald Buddenhagen2011-04-122-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de-duplicate code, and on the way don't try to re-resolve project variables of subprojects against the contents of the top level project. Reviewed-by: mariusSO
| | * | | run depend_command in build dir in VS generators as wellOswald Buddenhagen2011-04-124-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | followup to b139e7e96e5c47b412c4f0bbc4ae11d5cca99e61 Reviewed-by: mariusSO
| | * | | fixify target source against build treeOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that's where one would expect a target, after all. affects only extra targets explicitly requesting fixification, i.e., nothing. Reviewed-by: mariusSO
| | * | | fix fixifying of QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-121-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use the correct bases. notably, don't expect the input file in the output dir. Reviewed-by: mariusSO
| | * | | dist target: fixify OBJECTS_DIR against output dirOswald Buddenhagen2011-04-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the thing is terminally broken anyway, but whatever Reviewed-by: mariusSO
| | * | | fix paths of vpath-resolved filesOswald Buddenhagen2011-04-121-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8169 Reviewed-by: mariusSO
| | * | | simplify: absolute fixification ignores the base dir argumentsOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | * | | simplify: fileFixify for all same paths is always "."Oswald Buddenhagen2011-04-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this must have been the most arcane way to generate a single dot ever Reviewed-by: mariusSO
| | * | | simplify: the input and output dirs are already normalizedOswald Buddenhagen2011-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | * | | stop fixifying after first successOswald Buddenhagen2011-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | somewhat unlikely that this had much real-world effects ... except eating yet more cpu. Reviewed-by: mariusSO
| | * | | create a pwd string with a trailing slash only on demandOswald Buddenhagen2011-04-121-6/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | * | | useful location reporting for errors from QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-123-1/+16
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | * | | prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"Oswald Buddenhagen2011-04-121-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that way prf files don't have to check both the prefix and the actual template to identify visual studio mode. Reviewed-by: mariusSO
* | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-271-0/+1
|/ / / / | | | | | | | | | | | | (4.7-generated-declarative branch).
* | | | Merge earth-team into origin/master'Olivier Goffart2011-04-128-7/+29
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-085-4/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add support for -unset <prop> option to qmake.
| | * | | | Add support for -unset <prop> option to qmake.Darryl L. Miles2011-04-085-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1175 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-073-3/+3
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| | * | | win32-g++: Correct the order of linked Windows librariesJonathan Liu2011-04-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows 7, kernel32.dll exports many of the same functions as advapi32.dll. If executables link to these functions in kernel32.dll instead of advapi32.dll, running these executables on older versions of Windows will cause an entry point error. This would occur due to kernel32 being specified before advapi32. To resolve this issue, advapi32 is specified before kernel32 when linking. Task-number: QTBUG-18537 Merge-request: 1169 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-072-4/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-053-5/+5
| |\ \ \ \ | | | |_|/ | | |/| |
generated by cgit v0.12 at 2024-11-14 21:46:16 (GMT)