summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-151-3/+12
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Fix logic for autodetecting the embedded-linux packagePaul Olav Tvete2009-04-141-1/+7
| | | | | | | | | | | | | | The previous version would get confused because the embedded package also contains _x11 files. Reviewed-by: Thiago
| * Allow "i386" as an alias for x86 for Mac universal buildsMorten Sørvig2009-04-141-2/+5
| | | | | | | | | | | | GCC uses i386, but configure has always used x86, which can lead to confusion. Reviewed-by: nrc
| * Fix spelling errorMorten Sørvig2009-04-141-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Make ./configure work better with spaces in path names.hjk2009-04-151-20/+22
| | | | | | | | | | | | | | Quote a few variables that may contain spaces. Also, quote spaces in qmake's Makefile dependency section. Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
* | Add -qconfig support for non QWS builds.Robert Griebl2009-04-071-7/+8
| | | | | | | | | | | | | | There are customers using X11 on embedded systems, so make it possible to use -qconfig for those builds too. Reviewed-by: Paul Olav Tvete
* | Merge branch '4.5'Thiago Macieira2009-04-031-0/+8
|\ \ | |/
| * Add config test for XLibTom Cooksey2009-04-031-0/+8
| | | | | | | | | | | | | | | | | | Previously, it was entirely possible to successfully configure Qt/X11 without any X11 installed. The problems would only start showing up once you stated building. This is not very useful if you're cross-compiling and trying to setup the paths correctly. Reviewed-by: Denis
* | Keymap support for QWS.Robert Griebl2009-04-021-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for keymaps to the QWSKeyboardHandler. The keymaps can be generated by the kmap2qmap tool (see tools/ directory). The source keymaps can be standard Linux .kmap files. Changes to Qt: * completely refactored the Tty and Usb (now known as LinuxInput) handlers * removed the LinuxIS plugin (handled by LinuxInput now) * removed support for iPAQ, EBX and Zylonite keypads (obsolete hardware) * removed support for RAW tty mode. This could be re-added, for non-Linux systems by implementing a PC/AT scan-code to Linux keycode converter. New features for Tty and LinuxInput (ex Usb) handlers: * support for keymaps QWS_KEYBOARD=..:keymap=/path/to/x.qmap:.. * support for dead keys and the compose key * support for lock LEDs * support for key repeat rates (in ms): QWS_KEYBOARD=..:repeat-delay=x:repear-rate=y:.. * the default keymap supports latin1 composing via AltGr: QWS_KEYBOARD=..:enable-compose:.. * ctrl+alt+backspace application zapping can be disabled: QWS_KEYBOARD=..:disable-zap:.. * added virtual filter functions to both the Tty and the LinuxInput handlers. (QWSKeyboardHandler::processKeycode should be virtual in the first place, but that would be BIC) Still missing: * extended documentation for QWS_KEYBOARD Reviewed-By: Paul Olav Tvete Reviewed-By: Harald Fernengel
* make the configured namespace part of QT_BUILD_KEYhjk2009-04-021-0/+3
| | | | | | | | | The eclipse integration is namespaced, but it pulls in system plugins like the oxygen style. This breaks as the (non-namespaced) style plugin does not find a suitable QApplication instantiated (only a namespace one is there) Reviewed-by: thiago Task-number: 250185
* Mac: check for valid -arch arguments in configure.Morten Sørvig2009-03-301-0/+12
| | | | | | Allow x86 x86_64 ppc ppc64, exit with an error message if something else is passed? Reviewed-by: nrc
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+7270
generated by cgit v0.12 at 2024-11-13 23:31:07 (GMT)