| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
This makes sure that we only detect and use libraries that are actually
in the SDK.
Task-number: 109757
Reviewed-by: Richard Moe Gustavsen
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
If unixodbc detection fails, try and link/detect iodbc libraries and link against them.
Reviewed-by: Lincoln Ramsay
|
|\
| |
| |
| |
| | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by:cduclos
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
|
| |
| |
| |
| |
| |
| |
| | |
STRING="${STRING/x86/i386}" actually replaces whole words only,
so we don't need to fixup x86_64 afterwards.
Reviewed-by: nrc
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Reported downstream to Debian:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525570
Reviewed-by: Alexis
Reviewed-by: Thiago
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/itemviews/qabstractitemview.cpp
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/itemviews/qheaderview_p.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qpainterpath/tst_qpainterpath.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
The previous logic caused a license check when the eval
license file was missing.
Reviewed-by: Jason McDonald
Task-number: 251339
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
|
| |
| |
| |
| |
| |
| |
| | |
The previous version would get confused because the embedded package
also contains _x11 files.
Reviewed-by: Thiago
|
| |
| |
| |
| |
| |
| | |
GCC uses i386, but configure has always used x86, which can lead to confusion.
Reviewed-by: nrc
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
There are customers using X11 on embedded systems, so make it possible to
use -qconfig for those builds too.
Reviewed-by: Paul Olav Tvete
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Allow x86 x86_64 ppc ppc64, exit with an error message if something else is passed?
Reviewed-by: nrc
|
|
|