summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-021-1/+16
|\ | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| * Eliminate warning during configureGareth Pethig2009-06-261-1/+1
| | | | | | | | | | | | .../configure: line 4462: [: missing `]' Reviewed-by: Jason McDonald
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJustin McPherson2009-06-261-24/+144
| |\
| | * Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-241-0/+15
| | | | | | | | | | | | | | | | | | | | | ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags on the link line if it is needed by the OpenVG engine. Reviewed-by: trustme
| * | Always iodbc on OSX platform.Justin McPherson2009-06-261-1/+1
| | | | | | | | | | | | Reviewed-by: Bill King
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-241-24/+129
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * | Bump the minimum deployment target to 10.4.Norwegian Rock Cat2009-06-231-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | We have said in the past that 10.3 has been dropped for 4.6, but we actually have to do the work and make sure that it happens. This is the first step. Reviewed by: Morten Sørvig
| * | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-9/+122
| |/ | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-191-14/+15
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-4/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| | * revert built-time qm generationOswald Buddenhagen2009-06-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it simply breaks too much (embedded builds in particular). will come up with something better in master. note however, that the .qm files do NOT return to the repository. the release manager needs to run "make qm" before packaging, just like Qt-from-git users who want translations do (i.e., almost nobody). Reviewed-by: Jason McDonald
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-13/+17
| |\ \ | | |/
| | * Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-161-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * fix qm buildOswald Buddenhagen2009-06-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so "qmake -r && make" worked fine ... but configure does not simply run "qmake -r". also, now we have to build lrelease even when we don't build the other tools. Reviewed-by: Jason McDonald Reviewed-by: mariusSO
| | * properly indent embedded awk codeOswald Buddenhagen2009-06-151-11/+11
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Use output-path, not relative, when symlinking qvfb-files in configureTor Arne Vestbø2009-06-121-1/+2
| | | | | | | | | | | | | | | | | | | | | This gets rid of a few warnings when shadow-building Qt, since the symlinks are no longer created in the source tree. Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-111-27/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicswidget.cpp src/gui/painting/qdrawutil.cpp src/gui/painting/qpainterpath.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * | Make configure pass the -sdk option on to the configure tests.Morten Sørvig2009-06-111-27/+33
| | | | | | | | | | | | | | | | | | | | | | | | This makes sure that we only detect and use libraries that are actually in the SDK. Task-number: 109757 Reviewed-by: Richard Moe Gustavsen
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-091-15/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp
| * | Made configure work with older versions of /bin/sh.jasplin2009-06-051-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some older versions of the Bourne shell (/bin/sh) don't support the ! operator for negating the exit code of a pipeline. In particular, this is true on certain (all?) Solaris 9 platforms. The patch replaces all occurrences of the ! operator with equivalent (but slightly less elegant) expressions that test the $? variable instead. Reviewed-by: msorvig
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-291-7/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/doc.cpp
| * | Adds support for linking against iodbc on linux.Bill King2009-05-281-7/+18
| | | | | | | | | | | | | | | | | | If unixodbc detection fails, try and link/detect iodbc libraries and link against them. Reviewed-by: Lincoln Ramsay
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-271-15/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-14/+15
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| | * BT: Clean up Mac -arch handlingLincoln Ramsay2009-05-251-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | Instead of the multiple character-string replacements, just check for the discrete -arch values that we want to find. This makes the code clearer and should reduce the chance of subtle errors. Reviewed-by: Jason McDonald
| * | Merge branch '4.5'Thiago Macieira2009-05-221-2/+2
| |\ \ | | |/
| | * configure script fix, -h should display help and not just h.Alexis Menard2009-05-221-1/+1
| | | | | | | | | | | | Reviewed-by:cduclos
| | * Fix build regression caused by ba5fb9f05c891feac8ab69006189de1aaafebc18.Jason McDonald2009-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous "fix" caused the effect of the line before the change to be discarded, which breaks the mac binary package builds. When reviewing changes, please read the lines of context given in the patch - they are included for a reason. Acked-by: Lincoln Ramsay Acked-by: Rohan McGovern
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-221-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/kernel/kernel.pri src/corelib/tools/tools.pri tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-191-0/+1
| |\ \ | | |/
| | * Cocoa 64: ssl does not workRichard Moe Gustavsen2009-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The reason is the tha config.test ssl failed building. And the reason for that was a bad makefile flag (i386_64). Task-number: 253887 Reviewed-by: Trenton Schulz
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-071-1/+0
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | Merge branch '4.5'Thiago Macieira2009-05-071-1/+0
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| | * Fix configure error on Mac with "-arch x86"Morten Sørvig2009-05-071-1/+0
| | | | | | | | | | | | | | | | | | | | | STRING="${STRING/x86/i386}" actually replaces whole words only, so we don't need to fixup x86_64 afterwards. Reviewed-by: nrc
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-26/+39
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-061-26/+39
|\ \ \ | | |/ | |/| | | | kinetic-declarativeui
| * | Make sure image caching works with Qt3SupportAnders Bakken2009-05-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Store whether qt was built with qt3support enabled in .qmake.cache. We need this info to decide if QT3_SUPPORT should be defined when we include qimage_p.h. Otherwise we get data corruption issues since the size of struct in Qt is larger than the one we include in libqdirectfb. Reviewed-by: Donald <qt-info@nokia.com>
| * | Syntax error on configure scriptJoão Abecasis2009-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reported downstream to Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525570 Reviewed-by: Alexis Reviewed-by: Thiago
| * | Make the Mac configure tests consistent when configuring for multiple ↵Morten Sørvig2009-05-051-25/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | architechtures. For example, ./configure -arch x86_64 -arch ppc requires D-Bus compiled for x86_64 and ppc in order to enable it. Task-number: 249881 Reviewed-by: nrc
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-051-4/+5
|\ \ \ | | |/ | |/| | | | kinetic-declarativeui
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-041-4/+5
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| | * Make comment explaning the Mac deployment target setting clearer.Morten Sørvig2009-05-041-4/+5
| | |
* | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-221-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| | * Run syncqt when available and necessaryDirk Mueller2009-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The nightly public snapshots contain bin/syncqt but do not contain the include/ directory. Hence configure needs to detect this case and run syncqt to create the include tree so that configure actually passes Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-2/+24
|/ /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-171-2/+2
|\ \ | |/ | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * Allow -help to be used in a non-eval package.Lincoln Ramsay2009-04-171-2/+2
| | | | | | | | | | | | | | | | The previous logic caused a license check when the eval license file was missing. Reviewed-by: Jason McDonald Task-number: 251339
| * Make the configured namespace part of QT_BUILD_KEY_COMPAT too.Jarek Kobus2009-04-151-0/+3
| | | | | | | | | | | | | | | | The eclipse integration is namespaced, but it still pulled in system plugins like the oxygen style through QT_BUILD_KEY_COMPAT check in QLibraryPrivate::isPlugin() Task: 250185 Reviewed-by: dt <qtc-committer@nokia.com> BT: yes
generated by cgit v0.12 at 2025-01-10 19:56:32 (GMT)