| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix the remote command delimiter, this has cahnged at some point.
Assistant: Revert previous commit, issue was already fixed.
fix line endings
fix compilation with -plugin-kbd-*
Fix typo in docs
Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS
Fix compilation with QT_NO_DBUS
fix inaccurate comment
|
| |
| |
| |
| |
| |
| |
| | |
it certainly is not such a good idea to write mouse when one means kbd
...
Task-number: QTBUG-12483
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Consistent with QT_LFLAGS_* for other database drivers.
Support added to configure shell script and configure.exe.
Respect SYBASE and SYBASE_LIBS.
Use QT_LFLAGS_TDS in project files.
Merge-request: 2416
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| | |
qtmultimedia doesn't need gstreamer. inspired by MR 762.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It has been requested that we provide a configuration option to specify
the default "inner" graphics system that should be used when the
runtime graphics system is in use. The argument specified to the option
is written to the qconfig.h as QT_DEFAULT_RUNTIME_SYSTEM and this is
used to instantiate the default graphics system that will be used by
the runtime graphics system.
Reviewed-by: Gunnar Sletta
|
|/
|
|
|
|
|
| |
This is necessary in the case where Qt is built as part of the
platform, where configure will run before all the tools are built.
RevBy: Thomas Zander
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In shadow builds, the directory QT_BUILD_TREE/mkspecs/features
isn't a mere symlink anymore. The directories below mkspecs/features
are copied and every single file is symlinked.
This makes it possible to place .prf files into a shadow build's
mkspecs/features directory, like Qt Mobility does with its mobility.prf,
without polluting the source directory.
Task-number: QTBUG-12545
Reviewed-by: ossi
|
|/
|
|
|
|
|
|
| |
Fixes: "test: argument expected"
Need whitespace before closing ] .
Reviewed-by: Toby Tomkins
|
|
|
|
|
|
|
|
|
|
| |
Some of the library dependencies of the ICD Bearer Management plugin use
Qt. We include them in src/3rdparty and link against them statically to
avoid the circular build dependency. Libraries that do not use Qt are
still linked dynamically. The libraries which are statically linked are
libconninet and libgq-gconf.
Task-number: QTBUG-12354
|
|
|
|
|
| |
Task: QTBUG-8962
RevBy: Jason Barron
|
|
|
|
|
|
| |
Patch by Fathi Boudra <fathi.boudra@nokia.com>
Task-number: QTBUG-12379
|
|
|
|
|
|
|
|
| |
This is done by reading the module files from within qconfig.pri.
Task-number: QTBUG-12379
Rubber-stamped-by: Joerg Bornemann
Rubber-stamped-by: Marius Storm-Olsen
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added silent behavior to the most important Symbian build steps.
Fixed compiling with symbian/linux-armcc and configure -silent option
Removed some warnings from armcc that are unneeded.
Made the makefile build system use QMAKE_CFLAGS.xxx properly.
Automatically disabled unsupported modules for certain compilers.
Fixed an incorrect profile inclusion.
|
| |
| |
| |
| | |
RevBy: Trust me
|
|/
|
|
|
|
|
|
|
|
|
|
| |
The "yes" case slows us down on several occasions: (a) the CRC version used
slows down loading debug info when debugging a Qt application significantly,
(b) it does not work wit gdb 7.2's dwarf indexing (again, much slower
startup), and (c) (less important) the stripping takes extra time for each of
us when building Qt.
The flag is still supported for distributions or individuals that want to use it.
Reviewed-by: brad
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use aligned load for the blending of RGB32 over RGB32
tst_moc: workaround gcc bug.
Some more change to the changelog
Fix compilation with QT_NO_GRAPHICSVIEW
Updates changes-4.7.0
Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET.
Add a missing file in the config.test for SSE 4.2
Remove the masking when computing qAlpha()
Add support for more vector instructions on x86
Workaround gcc bug, disable test with old version of gcc
Do not crash due to a infinite recursion when using voiceover on MacOS
doc: Fix qdoc errors for text related files
QGraphicsItem: Animation leaves drawing artifacts when clipping is used.
moc: Slot with complex template default value does not compile
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add the configuration, autodetection, and the #define for vector
instructions on x86. The configuration has been extended with SSE3,
SSSE3, SSE4.1, SSE4.2 and AVX.
Reviewed-by: Andreas Kling
|
|\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/sql/drivers/drivers.pri
|
| | |
| | |
| | |
| | | |
RevBy: Trust me
|
| | |
| | |
| | |
| | |
| | | |
Task: QTBUG-11385
RevBy: Jason Barron
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This define is also used by the OpenVG module, and therefore needs
to be defined everywhere.
RevBy: Jason Barron
|
| | |
| | |
| | |
| | |
| | |
| | | |
Based on a patch by Oleh Vasyura <ext-oleh.2.vasyura@nokia.com>.
RevBy: Jason Barron
|
| |/
|/|
| |
| |
| |
| |
| |
| | |
Otherwise it is not possible to build projects outside of the Qt tree
without installing Qt to the SDK first.
Task: QTBUG-11727
RevBy: Trust me
|
| |
| |
| |
| | |
Reviewed-By: Jason McDonald
|
| |
| |
| |
| |
| | |
Task-number: QT-3371
Reviewed-by: Harald Fernengel
|
|/
|
|
|
|
|
|
| |
don't have configure create the forwarding headers (or symlinks on unix)
for qconfig.h, but instead have syncqt create forwarding headers for
not yet existing files.
Reviewed-by: joerg
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Consolidate zlib configuration redundancy
Fixed whitespace formatting
Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
Split image handler plugin project files
No explicit link to zlib/jpeg for system mng/tiff
Removed stray line continuations
Long live else!
qdoc: Added a solution for creating tables of contents for manuals.
Doc: Fixed markup.
Fixed size hint for combo box on windows
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, although the configure shell script could configure
built-in support for these image formats, the .pr[io] files
would nevertheless build them as plugins. Support was also
missing from qimagereader and qimagewriter. This has now been
added.
Configure.exe, while clearly intended to support this too,
needed a few minor fixes. For example, the usage of values
"qt" and "yes" was inconsistent.
For both configure tools, the explanation of the *non*-related
options has been clarified, i.e:
-no-libjpeg
-qt-libjpeg
-system-libjpeg
These options have nothing to do with the plugin/built-in
distinction.
There are (still) no configure options for specifying "plugin" or
"built-in" for these image formats. Quite reasonably, "plugin"
is selected for shared Qt and "built-in" is selected for static Qt.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
One pri for each handler, e.g. src/gui/image/qjpeghandler.pri.
One pri for each 3rd party package, e.g src/3rdparty/libjpeg.pri.
One shared pri for zlib dependency of 3rd party packages.
This was really about image handler plugins, but PNG got the
same treatment for consistency's sake.
Also, moved image handler source files from plugins to src/gui/image
so they are with the other image handlers.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/
|
|
|
| |
Task: QTBUG-11396
RevBy: Miikka Heikkinen
|
|
|
|
|
| |
Task-number: QTBUG-1853
Reviewed-by: Thiago
|
| |
|
|
|
|
|
|
|
|
| |
Static linking of WebKit is not going to be supported anymore in Qt 4.7,
so this commit makes sure it's mentioned in the documentation and that
configure disables WebKit if static linking of Qt is requested.
Reviewed-by: Andy Shaw <qt-info@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The PSQL_LIBS environment variable is a standard way to pass the
required library list. The changes here add support for this to the
configures.
Merge-request: 673
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This changeset provides the basis for targetting win32-g++ on Unix using
the configure shell script:
support added to the configure script itself
support added to relevant config.tests
support added to mingw makefile generator in qmake
new makespec: unsupported/win32-g++-cross
The makespec is based on the win32-g++ makespec.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
Made whitespace and case more consistent.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
I10n: Update German translations for 4.7.0
Fix a freetype link failure.
Fix configure test for DirectFB
Split Symbian bearer plugin into three platform specfic plugins
Doc: Fixed whitespace in the other configuration file for zh_CN.
Doc: Fixed whitespace in the Simplified Chinese doc configuration.
Unbreak Linux build when qendian.h is included before qglobal.h
Revert accidental commit of irrelevant stuff. Silly mondays..
Unbreak Linux build when qendian.h is included before qglobal.h
Fix QApplication/QWidget to really take ownership of input contexts
Added setting a hotspot on standard gestures
Fixed GestureOverride event delivery in GraphicsView.
add check-ts target to auto-asses translation completeness
qt_ja_JP.ts => qt_ja.ts
Fix incorrect \since tag
XQuery test suite (and others): remove p4 dependency
add docu about pixmaps being invalidated on qapp destruction
remove somewhat misleading warning about x11 pixmap leak
Disabled item view items use incorrect background color
Update the mkspec for linux-icc: don't use jump tables in shlibs
...
|
| |
| |
| |
| |
| |
| |
| | |
The availability of directfb-config does not depend on pkg-config
Merge-request: 2409
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| |
| |
| | |
it is "FOO=bar ./configure", not "./configure FOO=bar".
Task-number: QTBUG-11058
|
| |
| |
| |
| |
| |
| |
| |
| | |
unlike originally planned, we didn't remove the setting of the tool
paths from the qmake specs - for compat reasons. however, that means
that they will make the QT_BUILD_TREE handling in qtPrepareTool
ineffective, which meant that the qt build would try to use the tools
from an installed qt ...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
the function provides a cross-platform way to determine the exact
pathname of our build tools (moc, etc.).
use it in our .prf files, so we don't have to rely on qmake's
unreliable path separator normalization magic in extra compiler
commands, which broke on mingw+sh in silent mode.
remove the bootstrap tool path setting from configure, as it is
redundant now.
Reviewed-by: joerg
Task-number: QTBUG-10633
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On symbian cross-compiling is the only way so the libraries and headers
are all stored in symbian-specific ways which is called EPOCROOT.
This change makes a configure without -prefix being passed in populate
the EPOCROOT on 'make install'.
When the user passes a prefix it will just do what a normal unix build
does on make install.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
configure script searched qconfig-local.h under src/corelib/global/
with "-qconfig local". After this commit, configure tries to find local
directory if the file is not found in the path.
Now you can pass the option like "-qconfig ./qconfig-myconfig.h"
Merge-request: 2341
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
moc isn't compiled when qt is configured if -no-feature-datestring
Merge-request: 2347
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On GNU/Hurd, `uname -m` returns a string like "i686-AT386", which is not recognized.
Instead, do a specific mangling on "GNU" host, the same done by autotools' config.guess,
so the architecture can be identified and the proper atomic primitives used.
Merge-request: 638
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Added default countries for Mongolian and Nepali.
Updated tst_qlocale autotest.
Updated the 4.7.0 change log with my changes.
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 )
doc: Fixed many broken links.
doc: Fixed many broken links.
doc: Fixed many broken links.
qdoc: Set back to 3 cols for class list; we have a scrollbar now.
Fix build on Mac OS X and Windows.
Remove obsolete and broken qvfb skins.
Only setup ICD test data when ICD is enabled.
Doc: Fixed two diagrams and finally committed images for them.
Make sure cursorPositionChanged is emitted when doing undo/redo
Some more 4.7.0 changes
Fix cosmetic issue in designer filter edits
Doc: Adding support for IE 6, 7 and 8
doc: Updated the widgets tutorial to work without page links.
My 4.7.0 changes
Added support for es_419 locale.
Added Korean and Nynorsk locales support on Symbian.
...
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/tools/qlocale_symbian.cpp
|
| | | | |
|