| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-13988
Reviewed-by: TrustMe
|
|/ |
|
|
|
|
|
| |
Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321
Reviewer: David Boddie
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QString::split has overload, and if you want to take the address of a
function with overload, you need to cast it. If we really wanted to use
QString::split, we would have to do
QFuture<QStringList> future = QtConcurrent::run(string, static_cast<QStringList (QString::*)(const QString &, QString::SplitBehavior, Qt::CaseSensitivity ) const>(&QString::split), QString (", "), QString::KeepEmptyParts, Qt::CaseSensitive);
So use QByteArray::split as an example instead
Task-number: QTBUG-12897
Reviewed-by: David Boddie
|
|
|
|
|
| |
Reviewer: David Boddie
Task number: QTBUG-10411
|
|
|
|
|
|
|
| |
Const reference are slightly faster than doing a copy of the object
on each iteration.
Lead by example by having this pattern right in our documentation
|
|\
| |
| |
| |
| |
| | |
Conflicts:
configure
src/sql/drivers/drivers.pri
|
| |
| |
| |
| |
| | |
Task: QTBUG-11385
RevBy: Jason Barron
|
|/ |
|
|
|
|
|
|
|
|
| |
Executing "make deploy" will recreate project sis file and deploy it
into a device.
Task-number: QTBUG-5155
Reviewed-by: axis
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
|
|
| |
See change 8f47373e3795d7ec50387d5f1a771a59567bdaea for context.
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The biggest and most important issue was that QGraphicsItem::scroll
always accelerated the scroll without taking overlapping items or
opacity into account, which caused drawing artifacts. We can only do
accelerated scrolling if the item is opaque and not overlapped by
other items. There's no (sane) way to detect whether an item is
opaque or not (similar to Qt::WA_OpaquePaintEvent), which means we
cannot support accelerated scrolling unless the item is cached into
a pixmap (QGraphicsItem::setCacheMode).
The second issue was that QStyleOptionGraphicsItem::exposedRect always
contained the whole boundinRect() after an accelerated scroll
(even with the QGraphicsItem::ItemUsesExtendedStyleOption flag enabled).
Auto test included.
Task-number: QTBUG-8378, QTBUG-7703
Reviewed-by: yoann
|
|\
| |
| |
| | |
integration
|
| | |
|
| |
| |
| |
| | |
Done with: Axis
|
|/
|
|
|
| |
The docs for qDBusRegisterMetaType did not mention the required header
at all, since the function is documented as part of QDBusArgument.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
EABI and BWINS DEF file updates for Symbian
Further RVCT4 fixes for Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Fixed automatic patching of self-signed packages
Webkit got bigger, make it link again on armlink
Set library path properly for all systems
Make debugging floating point mistakes much easier.
Simplify docs a bit
Fix check for arm based systems
Fix option(recursive)
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp
src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
| |
| |
| |
| |
| | |
Update QObject documentation to match the Qt's Property System
documentation.
|
| |
| |
| |
| |
| | |
The docs should probably not suggest a permission level has so many
permissions that in practice nobody needs it (or can get it)
|
| |
| |
| |
| | |
Task-number: QTBUG-8865
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
|
| | |
| | |
| | |
| | | |
Add unit test and update docs.
|
| | |
| | |
| | |
| | |
| | | |
isOn() is an Qt 3 support member of QAbstractButton, isChecked() should
be used instead.
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| |
| |
| |
| |
| |
| |
| | |
The default_deployment item shouldn't be used to add own rules.
Task-number: QTBUG-9277
Reviewed-by: Janne Anttila
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added support for the following RSS_RULES variables to improve control
over placement of user defined rules inside application registration
resource file:
RSS_RULES.header - Rule placed before APP_REGISTRATION_INFO
RSS_RULES.footer - Rule placed after APP_REGISTRATION_INFO
RSS_RULES.service_list - Rule placed inside a SERVICE_INFO item
in the service_list of APP_REGISTRATION_INFO
RSS_RULES.file_ownership_list - Rule placed inside a
FILE_OWNERSHIP_INFO item in the file_ownership_list
of APP_REGISTRATION_INFO
RSS_RULES.datatype_list - Rule placed inside a DATATYPE item in the
datatype_list of APP_REGISTRATION_INFO
Task-number: QT-3083
Reviewed-by: Janne Anttila
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In Symbian, it is now possible to set certain subdirs to be built
only when specified define is true when bld.inf is parsed.
For example, compile a subdir only when building for emulator:
SUBDIRS += winscw_lib
winscw_lib.condition = WINSCW
Also improved SUBDIRS variable documentation; the modifiers were
completely undocumented.
Task-number: QT-3017
Reviewed-by: axis
|
| |
| |
| |
| | |
Reviewed-by: David Boddie <dboddie@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-6833
Task-number: QTBUG-937
Reviewed-by: Brad
Reviewed-by: Kent Hansen
|
|\ \
| |/
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Usage:
# Set conditional libraries
LIB.MARM = "LIBRARY myarm.lib"
LIB.WINSCW = "LIBRARY mywinscw.lib"
LIB.default = "LIBRARY mydefault.lib"
# Set conditional Epoc Heap Size
EHZ.WINSCW = "EPOCHEAPSIZE 0x2000 0x2000000"
EHZ.default = "EPOCHEAPSIZE 0x40000 0x400000"
# Add the conditional MMP rules
MYCONDITIONS = MARM WINSCW
MYVARIABLES = LIB EHZ
addMMPRules(MYCONDITIONS, MYVARIABLES)
This will generate the following in the mmp file:
#if defined(MARM)
LIBRARY myarm.lib
EPOCHEAPSIZE 0x40000 0x400000
#elif defined(WINSCW)
LIBRARY mywinscw.lib
EPOCHEAPSIZE 0x2000 0x2000000
#else
LIBRARY mydefault.lib
EPOCHEAPSIZE 0x40000 0x400000
#endif
Task-number: QT-2909
Reviewed-by: axis
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| |
| |
| |
| | |
Task: QTBUG-7766
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
|
| | | |
|
| | | |
|
|/ / |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
|
| |
| |
| |
| | |
Task: QTBUG-7997
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
"make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct
Task-number: QTBUG-8026
Reviewed-by: axis
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Smart installer packages bundle normal application sis with a bootstrap
package that will download a smart installer when the package
is installed. Smart installer in turn will download any dependencies
of the application that are available on remote server, such as
Open C, Qt, and QtWebkit packages, and install them
Smart installer packages are generated when DEPLOYMENT.installer_header
variable is defined in applicatoin .pro file.
This commit is still missing properly signed bootstrap.sis package.
Task-number: QTBUG-7908
Reviewed-by: Shane Kearns
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7683
Reviewed-by: Tom Cooksey
|