| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| | |
Reviewed-By: Paul
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
the same method was also added to QSslSocket.
previously, it was only possible to ignore all SSL errors; now, it is
also possible to only ignore specific SSL errors, given by a QList of
QSslErrors.
Moreover, it is possible to call this newly added method right after
connecting, not just when we get the SSL error.
Reviewed-by: Thiago
Task-number: 257322
|
|/ |
|
|
|
|
| |
Reviewed-by: Kent Hansen
|
| |
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: kh
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- .ts file -> TS file
- .qm file -> QM file
- .ui file -> UI file
+ a handfull of typos I stumbled over
Merge-request: 802
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
unlike in an earlier attempt, ids are textual this time.
the developer is able to provide a template for the string. when lupdate
and lrelease are integrated into the build process, this makes it
possible to avoid a round-trip to a dedicated string designer during the
early development stage.
Requirement-id: QT-435
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
Files files with qmake.
The correct file extension for generated file is best left to qmake to
decide.
|
| |
| |
| |
| | |
Requirement: QT-457
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication_x11.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | | |
The custom dash pattern must have an even number of entries. Our
examples were using an odd number.
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
should make it easier to apply a network disk cache with code snippets
now
Reviewed-by: David Boddie <dboddie@trolltech.com>
Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/qnamespace.qdoc
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicsscene.cpp
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The QStringBuilder class documentation is marked \internal.
A section has been added to the documentation for QString
that explains how to use the reimplemented '%' operator of
QStringBuilder to obtain more efficient string concatenation
operations.
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
src/gui/graphicsview/qgraphicsscene_p.h
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/qnamespace.qdoc
doc/src/snippets/code/src_gui_qproxystyle.cpp
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qt_x11_p.h
src/gui/kernel/qwidget.cpp
src/gui/styles/qproxystyle.cpp
src/gui/styles/qstyle.cpp
src/scripttools/debugging/qscriptdebugger.cpp
src/scripttools/debugging/qscriptenginedebugger.cpp
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/kernel/qsqldatabase.cpp
src/sql/kernel/qsqldriver.cpp
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | |/ /
| |/| | |
|
| | | | |
|
| |/ / |
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 253715
Reviewed-by: Trust Me
|
|\ \ \
| |/ / |
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As reported on qt-interest:
http://lists.trolltech.com/pipermail/qt-interest/2009-May/007036.html
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
kinetic-animations
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/tools.pri
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicswidget.h
src/gui/gui.pro
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: 253710
Reviewed-by: Trust Me
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/network/access/qhttpnetworkconnection.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The example was using deleteAllItems() to delete items from the layout. This method is now part of the QT3_SUPPORT and shold not be used if not needed. Replaced by deleting all items one by one.
Task-number: 220656
Rev-by: janarve
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This commit add a new API to add/find/remove pixmaps into QPixmapCache.
This new extension is based on a key that the cache give you during
the insertion. This key is internally a int which makes all operations
in the cache much more faster that the string approach.
Auto-tests has been extended as well and a benchmark has been added to
compare both approach. I also depecrate the find method for the
string API to have a method pointer based and not reference based like
the Qt policy says.
Reviewed-by: bnilsen
Reviewed-by: andreas
Followed-deeply-by: trond
|
| | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adding the count() function to the example.
Task-number: 220766
Rev-by: Geir Vattekar
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adding const to call. Changing QSqlRecord record() { return QSqlRecord(); } to QSqlRecord record() const { return QSqlRecord(); } This is needed since record() is a virtual function.
Task-number:204557
Rev-by: Geir Vattekar
|
| / / |
|