| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
| |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits)
Autotest: don't use Q_FUNC_INFO for testing which method got called
fix generated makefile dependencies
Cocoa: Demo browser can get stuck after closing modal dialog
Restore default if to system default on session close.
tst_qmake doesn't need QtGui
Use the full path to qmake in the qmake unit test
qdoc: Fixed erroneous links to QML basic types.
Fixed item view background color in Gtk style
scope fixes and clutter reduction for sql driver projects
I don't know why some linkers can't call this function, so comment it out.
QNetworkSession::close() method now send closed() signal while faking disconnection.
Add the missing license headers to the QString benchmark data
Fix building of qsimd.cpp on Windows CE
Use QElapsedTimer for the benchlib tests.
Properly implement the CPU feature disabling in qsimd.cpp.
Report the detected CPU features in the corelib boilerplate
Detect CPU features on ARM by reading the ELF auxvec.
Split the CPU-detection code into multiple functions for readability
Fixed delivering gestures to a toplevel widget.
Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add missing wildcard to scope where meant to include all
win32-g++ targets.
There is no reason to ignore QT_LFLAGS_TDS and QT_LFLAGS_PSQL
in static builds. Via LIBS these may end up in QMAKE_PRL_LIBS
in QtSql.prl. Also, the isEmpty() tests on these is
redundant and only wastes time.
Processing of QT_CFLAGS_PSQL should not depend on QT_LFLAGS_PSQL.
It no longer seems appropriate to clean up "-lz" here in
case of zlib bundled in QtCore. It's reasonable to expect
QT_LFLAGS_PSQL to be ready after configure.
Merge-request: 2459
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
|/|
| |
| |
| |
| | |
Conflicts:
bin/syncqt
src/opengl/qgl.cpp
tools/configure/configureapp.cpp
|
| |
| |
| |
| |
| |
| |
| | |
the unicode flag is entirely overrided by mistake.
Task-number:QTBUG-13109
Reviewed-by:Michael Goddard
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
DBNTWIN32 only if not Q_USE_SYBASE.
Workaround for RETCODE typedef conflict between ODBC and FreeTDS.
Include winsock2.h supplies SOCKET for FreeTDS.
Merge-request: 684
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| | |
RevBy: Trust me
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If Oracle national char types use different charset(NLS_NCHAR_CHARSET) with
the database charset (NLS_CHARSET), the oci client need to set OCI_ATTR_CHARSET_FORM
to SQLCS_NCHAR instead of SQLCS_IMPLICIT.
Task-number: QTBUG-10919
Reviewed-by: Michael Goddard
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | | |
Conflicts:
configure
src/sql/drivers/drivers.pri
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since we cannot extract to the epocroot (it is considered R/O), we
extract the header and the dso to the temporary build directories and
include them from there.
RevBy: Trust me
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes the Oracle invalid date bug when date is greater or equal to 2800
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
By converting the char into unsigned char to avoid the overflow when
getting the century from a char for years greater or equal to 2800.
Task-number: QTBUG-8210
Reviewed-by: Michael Goddard
|
| | |
| | |
| | |
| | | |
and make the cascade a bit nicer on the way ...
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously sql driver recipes each appeared in both the plugin
pro file and src/sql/drivers/drivers.pri for building into QtSql.
Split driver recipes into shared pri files.
Also split bundled 3rd party sqlite code recipe into a shared pri.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Reviewed-by: Trust Me
Requested-by: Legal
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The scope "win32-g++" comes from the name of the makespec. However, it
is frequently used to check for MinGW. This works fine as long as
win32-g++ is the only makespec for MinGW. Now we need the wildcard
to cover "win32-g++-cross" as well.
Also reordered test of win32 before win32-g++*.
Also took opportunity to use else.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Without this change, I get an error when building plug QODBC:
drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCPrivate*, int*)':
drivers\odbc\qsql_odbc.cpp:264: error: 'class QStringBuilder<QStringBuilder<QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>, QLatin1Char>, QString>' has no member named 'simplified'
drivers\odbc\qsql_odbc.cpp: In function 'QString qODBCWarn(const QODBCDriverPrivate*, int*)':
drivers\odbc\qsql_odbc.cpp:270: error: 'class QStringBuilder<QStringBuilder<QString, QLatin1Char>, QString>' has no member named 'simplified'
drivers\odbc\qsql_odbc.cpp: In function 'QString qGetStringData(void*, int, int, bool)':
drivers\odbc\qsql_odbc.cpp:403: warning: comparison between signed and unsigned integer expressions
drivers\odbc\qsql_odbc.cpp:444: warning: comparison between signed and unsigned integer expressions
Env:
Windows XP SP2
MinGW (GCC 4.4.0 from trolls ftp)
Merge-request: 2402
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix project file generation for MSVC 2010
Fix wrong translation and clip for the raster paint-engine on Mac
Return the correct library name in qt_gl_library_name for GLES*
qmake: remove useless evaluation of variables from VS project generators
Fix QT_NO_LIBRARY
Documentation for the Elastic Nodes example.
qmake: fix duplicate linker options in VS project files
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
qmake: fix duplicate compiler options in VS project files
Documentation for the Drag and Drop Robot example.
Fix crash in styles example when running with opengl graphicssystem
Fixed the sizehint for cols/rows in qtableview
QUrl: parsing of host name with an undercore.
Null pointer check
Revert "Try to use multisampled opengl graphicssystem on all platforms"
A small mistake when comparing the flag.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Some class uses QFactoryLoader without checking if QT_NO_LIBRARY is not
defined. Remove QT_NO_SETTINGS used with QT_NO_LIBRARY for
QFactoryLoader because LIBRARY depends on SETTINGS.
Merge-request: 578
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| | |
Conflicts:
src/openvg/qpaintengine_vg.cpp
src/script/bridge/qscriptqobject_p.h
tests/auto/bic/tst_bic.cpp
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7988
Reviewed-by: Justin McPherson
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8488
Reviewed-by: Justin McPherson
|
| |
| |
| |
| |
| |
| |
| |
| | |
Better unicode handling detection, plus turn off unicode if FreeTDS,
plus handling of returning strings under non-unicode scenarios.
Task-number: QTBUG-8846
Reviewed-by: Justin McPherson
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The original CLOB was being truncated at 4000 bytes, even though the
CLOB can hold up to 4gig, this ensures that its possible to get the
whole thing. There is already a test in qsqlquery for this.
Task-number: QTBUG-3875
Reviewed-by: Bill King
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| |
| |
| |
| | |
Task-number: QTBUG-5765
|
| |
| |
| |
| | |
Task-number: QTBUG-8752
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7218
Reviewed-by: Justin McPherson
|
| |
| |
| |
| |
| |
| | |
Stupid inconsistent constness/overall api
Task-number: QTBUG-6928
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fixed ODBC to use SQLTCHAR type and not assume that wchar's are 2
bytes wide.
Task-number: QTBUG-6928
Reviewed-by: Justin McPherson
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
optimize qstring::simplified()
Revert optimizations to QString::append
unbreak QList::append() and co. again
Implement bookmark manager widget.
optimization: use QList::reserve() and QVector::reserve()
amend "purge msvc.net and msvc2002 makespecs"
Added QPlainTextEditor::anchorAt(const QPoint &pos)
Fix memmory leak.
Fix spacing.
Prevent renaming the bookmarks menu root item, it's just a placeholder.
Fix broken set last shown pagen when the last page was about:blank.
Move launch with external app in base class.
Make sure the bookmarks menu updates on add/ remove as well.
Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
optimize QList::mid()
optimization: use QList::reserve() in QSet::toList()
add QList::reserve()
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly irrelevant when converting internal data
structures which are raw utf16 in host byte order. so replace it with
QString::fromUnicode() where possible (which seems to be everywhere).
the reasoning is the same as in commit e0fda52f, so not getting further
reviews.
Reviewed-by: denis
Reviewed-by: joao
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QT_LFLAGS_PSQL can introduce -lz. To respect qt-zlib, this must be
be removed so that zlib will come from -lQtCore4. Otherwise, linking
can fail due to there being two different libraries providing zlib.
This affects building shared Qt.
This patch fixes the problem for win32-g++ and also unix. Assumed
that QT_LFLAGS_PSQL is set in configure step if -lpq is not enough.
Not sure why parallel logic is in src/sql/drivers/drivers.pri but
I fixed that too.
Merge-request: 405
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| | |
This reverts commit 4935ec52fc07d4aaa7ae594cfe9986e25ca62dcb.
|
| |
| |
| |
| |
| |
| | |
On some platforms, especially iODBC, wchar_t is a 32bit value, not 16
Task-number: QTBUG-6928
|
| |
| |
| |
| |
| |
| |
| | |
This modification is needed to allow performance optimisations
necessary for QML.
Reviewed-by: Warwick Allison
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly pointless when converting internal data
structures which are raw utf16 in host byte order anyway. so replace
it with QString::fromRawData() (for short-lived strings) or
QString(const QChar *, int) (otherwise) if possible.
Reviewed-by: axis
Reviewed-by: mariusSO
Reviewed-by: Bill King
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2:
build fix for mingw
Build fix for MSVC2005 and older SDK
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Remove obsolete code for unsupported platforms
Character spacing when drawing a QPicture to a high DPI device.
|
| |\ |
|