| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Test directory untouched.
This just apply those regexp:
git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue
git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue
git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue
git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert
git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert
git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue
git checkout src/corelib/kernal/qvariant*
Rev-by: dev mailing list
|
|/
|
|
|
| |
Merge-request: 756
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
previously, loading schemas that contained xsd:all elements was not
possible because the algorithm used did not scale in that case.
This patch introduces a special checking for those elements which
removes the performance downside.
Reviewed-by: Tobias Koenig <tokoe@kde.org>
Task-number: QTBUG-6485
|
|
|
|
|
|
|
|
|
|
| |
Some functions were marked with Q_DECL_IMPORT where they should just be
Q_CORE_EXPORT. The reason is that this macro is expanded to nothing in
case of static builds whereas Q_DECL_IMPORT isn't (it is a dllimport).
That leads the linker to try to import it and it shouldn't.
Task-number: QTBUG-10791
Reviewed-by: gabi
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
All EGL-related changes from 4.6 were discarded.
Conflicts:
src/gui/egl/egl.pri
src/gui/egl/qegl.cpp
src/gui/egl/qegl_p.h
src/gui/egl/qegl_stub.cpp
src/gui/egl/qeglproperties_p.h
src/gui/egl/qeglproperties_stub.cpp
src/gui/gui.pro
src/multimedia/multimedia/audio/qaudioinput_win32_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The crash occurred when an anonymous type was created that was a list
type. In that case, we did not set the item type, which is used later at
XsdSchemaChecker::checkSimpleDerivationRestrictions(), which would lead
to a crash.
Additionally, in the xmlpatternsvalidator test, check the exit status of
the process after it has finished, to detect crashes.
Reviewed-by: Tobias Koenig <tokoe@kde.org>
Reviewed-by: Frans Englich
Task-number: QTBUG-8920
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/openvg/qpaintengine_vg.cpp
src/script/bridge/qscriptqobject_p.h
tests/auto/bic/tst_bic.cpp
|
| |
| |
| |
| | |
Reviewed-by: maurice
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
RVCT 4 is far more strict with regards to symbol visiblity that RVCT
2.2, and will hide symbols unless all references have default visibility
in the object files. Update the various places in Qt code where the
symbol visibility was set incorrectly for DLL-based platforms (those that
use __declspec(dllimport) and (dllexport).
Note: QtWebkit and QtScript are fixed in different commits.
Task-number: QTBUG-9903
Reviewed-by: Jason Barron
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.h
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
According to the Schema standard, loading a schema needs only be done
once for each schema location. Currently, there was a problem with
indirect includes (and imports/redefines):
a In this scenario, schema a would only remember to have loaded
/ \ b, but not d, which resulted in an error when c was loading d
b c again and the types in d were redefined.
| |
d d
Reviewed-by: Tobias Koenig <tokoe@kde.org>
Task-number: QTBUG-8394
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
previously, annotations were only supposed to appear within elements of
the form <element name="..."> ; However, they can also appear in
elements of the form <element ref="foo:bar">
Patch-by: Tobias König <tokoe@kde.org>
|
| |
| |
| |
| |
| |
| |
| | |
On Maemo5 devices there is an automatic conversion to Float.
So qtToXDMType() needs a special case.
Reviewed By: Peter Hartmann
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/assistant/lib/qhelpsearchquerywidget.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
|
|
|
|
|
|
|
| |
we had a hash function defined in xmlpatterns; this commit adds a global
hash function for QUrls.
Beware that code that defines its own hash function for QUrls will need
to #ifdef it out for 4.7.
Patch-By: Warwick Allison
Reviewed-by: Peter Hartmann
Reviewed-by: Thiago Macieira
|
|
|
|
| |
Added a missing \class command, some missing enum values, etc.
|
|
|
|
| |
Reviewed-by: Peter Hartmann
|
|
|
|
|
|
| |
being included by src/xmlpatterns.
Reviewed-by: Peter Hartmann
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\ |
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
dist/changes-4.6.0
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-3368
Reviewed-by: Thiago Macieira
|
| |/
|/|
| |
| |
| |
| |
| | |
An error message was changed in a cpp file, and this patch changes it
also in the file it is generated from.
Reviewed-by: Frans Englich
|
|/
|
|
|
|
|
| |
QRegExp::numCaptures() is marked as obsolete.
Replaced all usage in Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Fixed xmlpatterns autotests so that they compile for Symbian with
both RVCT and NokiaX86 compilers.
Reviewed-by: Janne Koskinen
|
|\ \
| |/
|/|
| |
| |
| | |
Conflicts:
src/gui/kernel/qevent.cpp
src/network/ssl/qsslerror.cpp
|
| |
| |
| |
| | |
Reviewed-by: Oswald Buddenhagen
|
| |
| |
| |
| |
| |
| |
| | |
Enable QtXmlPatterns module in qt package and assign an UID for it.
RevBy: Miikka Heikkinen
RevBy: Jason Barron
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The following warning was reported by MWCCSYM2
(Symbian emulator compiler):
\src\xmlpatterns\api\qxmlquery.h:77: warning: illegal empty declaration
Reviewed-by: TrustMe
|
|/
|
|
|
|
|
| |
Patch by Martin Jones. Malformed in codepaster so was manually applied. Builds
with public 5th SDK. The compiler workaround was documented.
Reviewed-by: Frans Englich
|
|
|
|
| |
Reviewed-by: Markus Goetz
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
| |
This change cleans up schema translation comments by having customary copy
editing for sentences: starts with a capital letter and ends with a full
stop.
Pointed out by Friedemann.
Reviewed-by: Friedemann Kleint
|
| |
|
|
|
|
| |
Reviewed-by: trust me
|
|
|
|
|
| |
Merge-request: 1320
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/frameworks-technologies/dbus-adaptors.qdoc
doc/src/qtdbus.qdoc
src/gui/accessible/qaccessible_mac_cocoa.mm
src/gui/kernel/qapplication_win.cpp
src/xmlpatterns/parser/createTokenLookup.sh
tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui
tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui
tests/auto/linguist/lupdate/testdata/good/parseui/project.ui
tests/auto/runQtXmlPatternsTests.sh
tests/auto/test.pl
tests/auto/uic/baseline/batchtranslation.ui
tests/auto/uic/baseline/batchtranslation.ui.h
tests/auto/uic/baseline/config.ui
tests/auto/uic/baseline/config.ui.h
tests/auto/uic/baseline/finddialog.ui
tests/auto/uic/baseline/finddialog.ui.h
tests/auto/uic/baseline/formwindowsettings.ui
tests/auto/uic/baseline/formwindowsettings.ui.h
tests/auto/uic/baseline/helpdialog.ui
tests/auto/uic/baseline/helpdialog.ui.h
tests/auto/uic/baseline/listwidgeteditor.ui
tests/auto/uic/baseline/listwidgeteditor.ui.h
tests/auto/uic/baseline/mainwindowbase.ui
tests/auto/uic/baseline/mainwindowbase.ui.h
tests/auto/uic/baseline/newactiondialog.ui
tests/auto/uic/baseline/newactiondialog.ui.h
tests/auto/uic/baseline/newform.ui
tests/auto/uic/baseline/newform.ui.h
tests/auto/uic/baseline/orderdialog.ui
tests/auto/uic/baseline/orderdialog.ui.h
tests/auto/uic/baseline/paletteeditor.ui
tests/auto/uic/baseline/paletteeditor.ui.h
tests/auto/uic/baseline/paletteeditoradvancedbase.ui
tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
tests/auto/uic/baseline/phrasebookbox.ui
tests/auto/uic/baseline/phrasebookbox.ui.h
tests/auto/uic/baseline/plugindialog.ui
tests/auto/uic/baseline/plugindialog.ui.h
tests/auto/uic/baseline/previewwidget.ui
tests/auto/uic/baseline/previewwidget.ui.h
tests/auto/uic/baseline/previewwidgetbase.ui
tests/auto/uic/baseline/previewwidgetbase.ui.h
tests/auto/uic/baseline/qfiledialog.ui
tests/auto/uic/baseline/qfiledialog.ui.h
tests/auto/uic/baseline/qtgradientdialog.ui
tests/auto/uic/baseline/qtgradientdialog.ui.h
tests/auto/uic/baseline/qtgradientviewdialog.ui
tests/auto/uic/baseline/qtgradientviewdialog.ui.h
tests/auto/uic/baseline/saveformastemplate.ui
tests/auto/uic/baseline/saveformastemplate.ui.h
tests/auto/uic/baseline/statistics.ui
tests/auto/uic/baseline/statistics.ui.h
tests/auto/uic/baseline/stringlisteditor.ui
tests/auto/uic/baseline/stringlisteditor.ui.h
tests/auto/uic/baseline/tabbedbrowser.ui
tests/auto/uic/baseline/tabbedbrowser.ui.h
tests/auto/uic/baseline/tablewidgeteditor.ui
tests/auto/uic/baseline/tablewidgeteditor.ui.h
tests/auto/uic/baseline/translatedialog.ui
tests/auto/uic/baseline/translatedialog.ui.h
tests/auto/uic/baseline/treewidgeteditor.ui
tests/auto/uic/baseline/treewidgeteditor.ui.h
tests/auto/uic/baseline/trpreviewtool.ui
tests/auto/uic/baseline/trpreviewtool.ui.h
tests/auto/uic3/baseline/about.ui
tests/auto/uic3/baseline/about.ui.4
tests/auto/uic3/baseline/actioneditor.ui
tests/auto/uic3/baseline/actioneditor.ui.4
tests/auto/uic3/baseline/config.ui
tests/auto/uic3/baseline/config.ui.4
tests/auto/uic3/baseline/configtoolboxdialog.ui
tests/auto/uic3/baseline/configtoolboxdialog.ui.4
tests/auto/uic3/baseline/connectiondialog.ui
tests/auto/uic3/baseline/connectiondialog.ui.4
tests/auto/uic3/baseline/createtemplate.ui
tests/auto/uic3/baseline/createtemplate.ui.4
tests/auto/uic3/baseline/customwidgeteditor.ui
tests/auto/uic3/baseline/customwidgeteditor.ui.4
tests/auto/uic3/baseline/dbconnection.ui
tests/auto/uic3/baseline/dbconnection.ui.4
tests/auto/uic3/baseline/dbconnectioneditor.ui
tests/auto/uic3/baseline/dbconnectioneditor.ui.4
tests/auto/uic3/baseline/dbconnections.ui
tests/auto/uic3/baseline/dbconnections.ui.4
tests/auto/uic3/baseline/editfunctions.ui
tests/auto/uic3/baseline/editfunctions.ui.4
tests/auto/uic3/baseline/finddialog.ui
tests/auto/uic3/baseline/finddialog.ui.4
tests/auto/uic3/baseline/formsettings.ui
tests/auto/uic3/baseline/formsettings.ui.4
tests/auto/uic3/baseline/gotolinedialog.ui
tests/auto/uic3/baseline/gotolinedialog.ui.4
tests/auto/uic3/baseline/helpdialog.ui
tests/auto/uic3/baseline/helpdialog.ui.4
tests/auto/uic3/baseline/iconvieweditor.ui
tests/auto/uic3/baseline/iconvieweditor.ui.4
tests/auto/uic3/baseline/listboxeditor.ui
tests/auto/uic3/baseline/listboxeditor.ui.4
tests/auto/uic3/baseline/listeditor.ui
tests/auto/uic3/baseline/listeditor.ui.4
tests/auto/uic3/baseline/listvieweditor.ui
tests/auto/uic3/baseline/listvieweditor.ui.4
tests/auto/uic3/baseline/mainfilesettings.ui
tests/auto/uic3/baseline/mainfilesettings.ui.4
tests/auto/uic3/baseline/mainwindowbase.ui
tests/auto/uic3/baseline/mainwindowbase.ui.4
tests/auto/uic3/baseline/mainwindowwizard.ui
tests/auto/uic3/baseline/mainwindowwizard.ui.4
tests/auto/uic3/baseline/multilineeditor.ui
tests/auto/uic3/baseline/multilineeditor.ui.4
tests/auto/uic3/baseline/newform.ui
tests/auto/uic3/baseline/newform.ui.4
tests/auto/uic3/baseline/paletteeditor.ui
tests/auto/uic3/baseline/paletteeditor.ui.4
tests/auto/uic3/baseline/paletteeditoradvanced.ui
tests/auto/uic3/baseline/paletteeditoradvanced.ui.4
tests/auto/uic3/baseline/paletteeditoradvancedbase.ui
tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4
tests/auto/uic3/baseline/pixmapcollectioneditor.ui
tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4
tests/auto/uic3/baseline/pixmapfunction.ui
tests/auto/uic3/baseline/pixmapfunction.ui.4
tests/auto/uic3/baseline/preferences.ui
tests/auto/uic3/baseline/preferences.ui.4
tests/auto/uic3/baseline/previewwidget.ui
tests/auto/uic3/baseline/previewwidget.ui.4
tests/auto/uic3/baseline/previewwidgetbase.ui
tests/auto/uic3/baseline/previewwidgetbase.ui.4
tests/auto/uic3/baseline/projectsettings.ui
tests/auto/uic3/baseline/projectsettings.ui.4
tests/auto/uic3/baseline/replacedialog.ui
tests/auto/uic3/baseline/replacedialog.ui.4
tests/auto/uic3/baseline/richtextfontdialog.ui
tests/auto/uic3/baseline/richtextfontdialog.ui.4
tests/auto/uic3/baseline/settingsdialog.ui
tests/auto/uic3/baseline/settingsdialog.ui.4
tests/auto/uic3/baseline/sqlformwizard.ui
tests/auto/uic3/baseline/sqlformwizard.ui.4
tests/auto/uic3/baseline/startdialog.ui
tests/auto/uic3/baseline/startdialog.ui.4
tests/auto/uic3/baseline/statistics.ui
tests/auto/uic3/baseline/statistics.ui.4
tests/auto/uic3/baseline/tabbedbrowser.ui
tests/auto/uic3/baseline/tabbedbrowser.ui.4
tests/auto/uic3/baseline/tableeditor.ui
tests/auto/uic3/baseline/tableeditor.ui.4
tests/auto/uic3/baseline/topicchooser.ui
tests/auto/uic3/baseline/topicchooser.ui.4
tests/auto/uic3/baseline/variabledialog.ui
tests/auto/uic3/baseline/variabledialog.ui.4
tests/auto/uic3/baseline/wizardeditor.ui.4
tests/auto/uiloader/baseline/batchtranslation.ui
tests/auto/uiloader/baseline/config.ui
tests/auto/uiloader/baseline/finddialog.ui
tests/auto/uiloader/baseline/formwindowsettings.ui
tests/auto/uiloader/baseline/helpdialog.ui
tests/auto/uiloader/baseline/listwidgeteditor.ui
tests/auto/uiloader/baseline/mainwindowbase.ui
tests/auto/uiloader/baseline/newactiondialog.ui
tests/auto/uiloader/baseline/newform.ui
tests/auto/uiloader/baseline/orderdialog.ui
tests/auto/uiloader/baseline/paletteeditor.ui
tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
tests/auto/uiloader/baseline/phrasebookbox.ui
tests/auto/uiloader/baseline/plugindialog.ui
tests/auto/uiloader/baseline/previewwidget.ui
tests/auto/uiloader/baseline/previewwidgetbase.ui
tests/auto/uiloader/baseline/qfiledialog.ui
tests/auto/uiloader/baseline/qtgradientdialog.ui
tests/auto/uiloader/baseline/qtgradienteditor.ui
tests/auto/uiloader/baseline/qtgradientviewdialog.ui
tests/auto/uiloader/baseline/saveformastemplate.ui
tests/auto/uiloader/baseline/statistics.ui
tests/auto/uiloader/baseline/stringlisteditor.ui
tests/auto/uiloader/baseline/tabbedbrowser.ui
tests/auto/uiloader/baseline/tablewidgeteditor.ui
tests/auto/uiloader/baseline/translatedialog.ui
tests/auto/uiloader/baseline/treewidgeteditor.ui
tests/auto/uiloader/baseline/trpreviewtool.ui
tools/assistant/compat/mainwindow.cpp
tools/assistant/tools/assistant/mainwindow.cpp
tools/designer/src/designer/versiondialog.cpp
tools/linguist/linguist/mainwindow.cpp
tools/linguist/shared/make-qscript.sh
tools/qdbus/qdbusviewer/qdbusviewer.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|