| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
manager may be 0.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
tests/auto/qlineedit/tst_qlineedit.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (85 commits)
Add make stub_sis target, and add webkit stub to qt.iby
Fix to S60 softkeys when no active Qt window or native widget is shown.
doc: Fixed several typos.
Doc: remove \preliminary tag from public multimedia classes
Fixed the perl download link and description in docs
Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again
QNAM HTTP: Optimize detectPipeliningSupport()
QNAM HTTP: Set channel to IdleState at better place
QXmlSchema: fix crash in schema parser
We need to export qBadAlloc() on all platforms
now really fix the message editor for dark backgrounds
Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."
Update Symbian DEF files
Export a function to get dfb-surface from a pixmap
Fix the WebKit build
Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.
Fixed compilation with QT_NO_WHEELEVENT
Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.
Fixed drawing QPixmaps on QGLWidgets on different X11 screens.
Take into account the solaris-cc-64-stlport mkspec
...
|
| | |\
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Refactor font and zoom handling, reduces clutter in central widget.
Some more refactoring.
Move the QWebView based help viewer into it's own source files.
add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs
use variables from the spec instead of hard-coding platform ifdefs
move $(DEL_FILE) 2> NUL redirection into .conf file
fix host platform conditional
purge msvc.net and msvc2002 makespecs. unsupported for a while now.
purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.
remove weird -tp ce matching line nobody can say anything about
remove remainder of mac9 mode
remove the most blatant tmake compat paths
simplify
add qt5 todo
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: ck
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Move the QTextBrowser based help viewer into it's own source files
and introduce a common base clase that currently only contains the
statics, but more to come for common stuff.
Review: ck
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
littering generic makefile generator code with it is both plain ugly and
unnecessary.
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Suggested-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Acked-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-By: mariusSO
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
no need to recalculate a value which we have an own variable for
Reviewed-By: mariusSO
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: mariusSO
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix scrolling backwards when pathItemCount != model.count
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix scrolling backwards when pathItemCount != model.count
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also fixes
-Scrolling backwards when model.count != 0 mod pathItemCount
-A minor typo in a comment
Task-number: QTBUG-6865
Reviewed-by: Martin Jones
|
| |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enabled searching of IM plugins on Symbian.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- It will try hbim and coefep first.
- If both are missing (coefep can only be missing if compiled without
S60 support), other plugins in the inputmethods plugin directory
are attempted.
Task: QT-2460
RevBy: Sami Merila
|
| |\ \ \ \ \
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Help system: Handle all Clucene exceptions.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: kh1
|
| |\ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3410 commits)
Compile fix for OSX.
Make compile. QmlMetaType::isObject() has changed to isQObject().
Fix warnings
Reference count shared expression data
Cleanup public QmlMetaType API
Fix case sensitivity bug in previous commit
Adds inputMethodHint property to TextEdit and TextInput.
Decouple Loader from QmlGraphicsItem
Make test more stable.
Fixed race condition in tst_qmlgraphicswebview::multipleWindows
Explicitly pass size to standard pixmap icon loaders.
Fix qmlgraphicswebview:pixelCache autotest by setting defaults on html
Fixed compile of these recently renamed tests.
Update QmlChanges.txt
Adds qml prefix to all declarative autotests
Removed "running: true" for animations used as propertyvaluesource
Animations are running by default when used as property source value
Fix QmlEngine offlineStoragePath test.
Fix Image test on Windows.
Fix FontLoader test on Windows.
...
|
| | | |/ /
| | |/| | |
|
| | |\ \ \ |
|
| | | | | | |
|
| | |/ / / |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QmlExpression uses data from the QmlCompiledComponent (eg. expression
string data). It must therefore hold a reference to the
QmlCompiledComponent to prevent the data being deleted.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Remove some unnecessary methods from the QmlMetaType class
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Martin Jones
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QT-2823
Reviewed-by: Aaron Kennedy
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
qApp->processEvents() has the same effect as QTest::qWait(0) and
should already `Let the animation start'. The additional events
processing would let the animation progress too far on a slow machine.
Timing tested by running under Valgrind.
|