| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
configure
|
| | |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
AUTODETECT_COCOA -> QT_AUTODETECT_COCOA
Reviewed-by:thiago
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
$CFG_MAC_COCOA has a default value of yes now so be sure we the platform
is Mac before doing anything with it.
Reviewed-by:thiago
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Only perform the architecture check when "-carbon" has
been specified on the configure line, as this is the
only case where cocoa might have to be enabled on an
arch by arch basis.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The "-cococa" option is now deprecated, "-carbon" is added.
This is mostly a behind-the-scenes change, but has some implications:
If you are developing on Snow Leopard Qt vill be built in x86_64
mode by default. This can be overridden by configuring with "-arch x86"
Qt for Cocoa will not build on 10.4 Tiger, nor will Cocoa-based
binaries deploy back to that platform. Configure with "-carbon"
if you want to target 10.4.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Designer.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task:QTBUG-2158
Designer no longer uses XShape for Drag and Drop.
|
| |\ \ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
Conflicts:
src/s60installs/s60installs.pro
|
| | | |_|_|/
| |/| | | |
|
| | | | | | |
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure
src/gui/painting/qpainter.cpp
src/s60installs/s60installs.pro
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-7549
Reviewed-By: Markus Goetz
|
| | | |_|/
| |/| | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Escape the arguments variable properly.
Reviewed-by: Thiago
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | |/
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |/
| |
| |
| |
| |
| |
| | |
e.g. QMAKE_INCDIR_OPENGL_ES2
Merge-request: 2279
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Adds new NEON configure test and -no-neon configure option. NEON
implementations can also be turned off by setting the QT_NO_NEON
environment variable.
Performance improvements (in frames per second):
- Blending ARGB32 on RGB32/ARGB32, mostly opaque: 71 %
- Blending ARGB32 on RGB32/ARGB32, no opaque pixels: 108 %
- Blending ARGB32 on RGB32/ARGB32, with 0.5 opacity: 158 %
- Blending RGB32 on RGB32/ARGB32, with 0.5 opacity: 189 %
Task-number: QTBUG-6684
Reviewed-by: Gunnar Sletta
Reviewed-by: Paul Olav Tvete
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fix compilation with -static on Mac OS X
Configure support for multiple include levels in qmake.conf hierarchy.
Stop the configuration if the test compiler cannot be found.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If a configuration file included in qmake.conf had an include
statements of its own, the variables defined in the second level
of included files were not parsed by getQMakeConf function from
configure.
Author: Adrian Constantin <adrian.constantin@nokia.com>
Reviewed-by: Thiago Macieira
|
| | | |
| | |
| | |
| | |
| | | |
Author: Adrian Constantin <adrian.constantin@nokia.com>
Reviewed-by: Thiago Macieira
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Fix precision loss warning (qreal vs. float on Windows)
def file maintenance.
def file maintenance.
Fixed compile for S60 (.def file updates).
QPlainTextEdit scrolling issue with folded paragraphs
Designer: Show actions in action editor in QKeySequence::NativeText
Fix up documentation examples for low-level audio.
Add -audio-backend and -no-audio-backend configure option.
audioinput and audiooutput examples not using isFormatSupported
Qt fails to build on RHEL 4 and other older Linux versions because of
|
| | | |\ |
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure.exe
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Allow better control over audio backend used.
Reviewed-by:Justin McPherson
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add an image allocation pool to the OpenVG paint engine
Fix QMetaObject::connect and disconnect with "dynamic signals"
Test fixed for Windows CE.
Removed the chip demo for windows CE
Compilation fix for Windows Mobile
Make mkspec/unsupported/linux-host-g++ use correct include
Add "nocopy" mode for seperate-debug-info to configure
Optimized blur / drop shadow effects for the GL 2 paint engine.
Fixed bug in graphics effects caching of graphics item hierarchies.
Added InvalidateReason to invalidateCache to optimize effects
Fixed bug in QGraphicsPixmapItem shortcut for graphics effects.
Optimize QGraphicsItemEffectSourcePrivate::pixmap() for QGraphicsPixmapItems.
Improved raster blur implementation.
Determine QPrinterInfo's supportedPaperSizes on demand.
Added vg to the performance section of the QPainter docs
Stabilize test
Fix warning in public header
OpenVG .def file updates.
|
| | | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This patch was written by Harald Fernengel for Maemo5 port. This effectively
just adds -g to QMAKE_CFLAGS & QMAKE_CXXFLAGS and is mainly for packagers who
want to build Qt in release mode and still have debug symbols, but will want
to strip those debug symbols out themselves (rather than let Qt do it).
Reviewed-By: Harald Fernengel
Reviewed-By: Thiago Macieira
|
| | |\ \ \ \ \
| | |_|/ / /
| |/| | / /
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Update Polish translations
Assistant: Add documentation for -remove-search-index.
Designer: Handle "visible"-properties of item view headers correctly.
Fix .gitignore to not ignore qdoc.pro
Update polish translations
Fix broken delete key, some cleanup.
Assistant: Fix race condition in index creation.
Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
SDK to use.
Merge-request: 2254
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qfontdialog_mac.mm needs to handle exceptions thrown by Cocoa,
even if Qt is configured with if -no-exceptions.
This ads a bit of qmake logic for the benefit of a single file,
but I would like to keep -no-exceptions working. The savings
are significant (around 10-15%).
Revby: Richard Moe Gustavsen
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
| | |
| | |
| | | |
Untested, I don't have a mac.
|
| |/ / |
|
| | |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
| | |
| |
| |
| |
| |
| |
| | |
When building for one of the RTOS, require a specific license key.
Task-number: QT-2519
Reviewed-by: Jason McDonald
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Add the necessary logic to deal with Symbian and the Real-Time
operating systems (QNX and VxWorks). Symbian is considered an embedded
license, so it allows a no-deploy build on X11 and Mac.
Task-number: QT-2519
Reviewed-by: Jason McDonald
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
tools/configure/configureapp.cpp
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| | |/
| |
| |
| |
| | |
Reviewed-by: Thiago
Reviewed-by: Jason McDonald
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
this is mostly a revert of the revert of the previous attempt, only that
this time we have a bootstrapped lrelease which won't blow up for
cross-compilations.
Reviewed-By: Jason McDonald
Task-Id: QTBUG-4939
|
| |/
|
|
|
|
|
|
| |
needed for build-time qm generation in qt itself.
the downsides are a) that the other bootstrapped tools grow by ~12kB
(on x86) due to qdatastream being pulled in by qbytearray and qstring
and b) that lrelease isn't l10n'd itself anymore (the latter could be
fixed by building a non-qobject qtranslator).
|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
If you run configure on Unix more than once using an eval license (or
-DQT_EVAL), configure outputs an error and fails to overwrite
src/corelib/global/qconfig_eval.cpp. This is corrected simply by
removing any existing instance of the file before re-creating it.
Reviewed-by: Trust Me
|
