| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
A tab was introduced in 16614121f8eff813efadc999a7db9ce47eae769e
|
| |
|
|
|
|
|
|
|
|
|
|
| |
GTK Style
A QHashableLatin1Literal was a bit too clever for sunstudio.
Added and alternate constructor for sunstudio(ifdef)
Should not affect other compilers.
Other: Minor compile fixes, extra semicolon after macros etc.
Merge-request: 547
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits)
Fix compilation with Sun CC: no semi-colon after Q_ENUM.
Remove the "Insert unicode control character" menu entry on X11.
adds a timeout option to QThreadPool::waitForDone();
Remove leading whitespace from Qt header macros.
Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
Add QDateTime members that operate on 64-bit milliseconds.
Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
qdoc: Added <div> elements to some html output for class references.
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
...
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
qdoc: Added <div> elements to some html output for class references.
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
QtScript: Add yet more missing API shims
QtScript: Make sure the old identifier table is restored
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This palette tweak is no longer needed now that we set alternate
row color on application startup. It also breaks on systems such
as GNOME and KDE where you can configure this color.
Reviewed-by: ogoffart
Task-number: QTBUG-6516
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: ogoffart
Task-number: QTBUG-7525
|
| | | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (77 commits)
Recompute the source location of regexp literals.
Adds a way to clear the state list property in QDeclarativeStateGroup
I've been told this fixes compilation on windows.
Doc Augmentation
Added highlight ranges/modes to PathView
Use QThread IdlePriority rather than linux platform code.
Test and fix order of transform application.
Test transforms.
Fix namespace.
Simple case, no size returned.
sourceWidth/sourceHeight -> sourceSize
QDeclarativeItem don't need to emit childrenChanged anymore.
Control of image rendered size (esp. SVG).
Do not call parent implementation if we accept the keyPressEvent in GridView and ListView delegates.
Update test.
Add autotest for QTBUG-9367.
Remove Q prefix from the validators.
Really fix qMin() parameter types.
Add declarative subdir to examples.pro
Add Symbian deploy section for qml import plugins
...
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.h
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If button contains a layout with widgets instead of having direct label
and icon, QS60Style calculates the size of the content incorrectly.
This is regression for a fix to QTBUG-7586. Now style ignores orginal
size of pushbutton and tries to calculate correct height by itself.
Issue is fixed by selecting teh bigger of orginal height and calculated
height.
Task-number: QT-3197
Reviewed-by: Alessandro Portale
|
| |\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
subElementRect failed to verify that the theme was
resolved before accessing certain data structures.
Reviewed-by: ogoffart
Task-number: QTBUG-9240
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If the spinbox is very tall considering its width (ratio 2:1), the
spinbuttons can easily hide the lineEdit when they are scaled up.
For example QSize(200, 100) QSpinBox does not have any lineEdit at all,
since spinbuttons are scaled up to be 100*100 squares and deployed
side-by-side.
As a fix, once spinbuttons occupy half of the total width of spinbox,
they stop growing. For very tall spinboxes, spinbuttons are deployed
one top of the other, to make the lineEdit bigger.
Task-number: QTBUG-9321
Reviewed-by: Alessandro Portale
|
| |\ \ \ \ \ \
| |/ / / / /
| | / / / /
| |/ / / /
|/| | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Due to incorrect initialization of CFbsBitmap, graphic frames (9-part,
or 3-part ones) are drawn with white non-transparent rect below them.
Initialization corrected.
Task-number: QT-3185
Reviewed-by: Janne Anttila
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-5992
Reviewed-By: Sami Merila
|
| | | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Messageboxes are smaller than native ones.
This is due to that native ones have a lot of empty space.
To fix this, we define a new custom pixel metrics that is the minimum
height of one text line messagebox (aka AknPopUp) on the native side.
Then we ensure that the QMessageBox is at least of this height.
Additionally we do some minor styling for QMessageBox:
- the corners graphics are now as rounded as on native side
- the font is set to match the native side
- the top margin space is doubled for dialogs, which is rather good
approximation of native side
Task-number: QTBUG-4875
Reviewed-by: Janne Anttila
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Commit 47902b7587d66c0941bacf08b31b8caae264f09a was missing one enum
rename in qs60style_s60.cpp
Reviewed-by: TrustMe
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The focus frame was drawn with a low opacity. That was intended meant
to increase aesthetics but in reality decreased usability. Now,
the opacity is higher. But still with a difference between navigation
mode and edit mode.
Task-number: QT-826
Reviewed-by: Sami Merila
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The QFocusFrame drawing code in QS60Style incorrectly assumed that
PM_LayoutSpacing is always equal to PM_FocusFrameMargin. When these
values diverged, the focus frame broke as described in task QTBUG-8036.
The fix makes the drawing more robust. The focus frame width is never
thicker than PM_LayoutSpacing and PM_FocusFrameMargin. And instead of
drawing a roundRect with calculated pen width, we are now filling a
roundRect. That makes the focusFrame more apparent.
Task-number: QTBUG-8036
Reviewed-by: Sami Merila
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Use only public custom pixel metrics. Remove the internal enum
and switch usage of those to public enum values.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Remove unnecessary #include, remove unnecessary integer, correct
spelling issues in comments and replace tabs with spaces.
Reviewed-by: Alessandro Portale
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is due that
a) custom values are internal and not exposed
b) values use different format - they are indexes for internal data[]
table and not according to QStyle documentation for pixel metrics.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is due that the size of the pixel metrics table is stored in some
object file and the file is not updated, even if we increase the table
size integer. Removing direct calls from internal methods to member
variable data[] removes the need to do whole rebuild when adding
values.
Relates to task #9247.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
| | |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
We are now checking that the QAction is not related
to the About or Quit button on Mac OS X
Task-number: QTBUG-7540
Reviewed-by: Morten Sorvig
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Four-way merge: take the qt-qml.git#4.7 branch version (which uses
fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1.
Conflicts:
src/declarative/qml/qdeclarativecompiler.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It follows the GNOME HIG as specified in
http://library.gnome.org/devel/hig-book/stable/controls-lists.html.en
Ammending commit reversion fad919fa0fe976facc94685fd1460b4961b72c4e.
Reviewed-by: jbache
Task-number: QTBUG-9299
|
| | | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 74ce3dea8b3ea06d61cef4e729f6a95f670461fe.
The sorting order is intentional.
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix warnings in the declarative module
compile fix for mingw (also removes some warnings)
Sort indicators displayed incorrectly in GTK style
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Thierry
Task-number: QTBUG-9299
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The NONCLIENTMETRICSW::iPaddedBorderWidth member is supported only on
Windows Vista and above. So when calling the SystemParametersInfo
for SPI_GETNONCLIENTMETRICS on Windows XP, the size for that member
needs to be removed from NONCLIENTMETRICSW::cbSize.
Task-number: QTBUG-8639
Reviewed-by: Thierry
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits)
Fix the test of QDirIterator with NoDot and NoDotDot
Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot
QFSFileEngine: don't look through NTFS junctions
After showing modal windows, WM_LBUTTONUP for double click is ignored.
Possible fix for missing QML properties in the qt.qhp file.
Use standard theme icons in Linguist where possible
Use more standard icons from the theme in Assistant
Use more standard icons for standard actions in Designer
Drag & drop operations wont end while using Remote Desktop sessions
_close(fd) closes the associated handle and not the other way around
Fixed locale mapping on Symbian.
Revert change 7bf4512659 on Cocoa.
Extended the high_attributes array, since we have more than 127 widget attributes now.
Added instructions for MinGW users wanting to build the MySQL driver.
Designer: Fix broken resource view.
Add missing ,.
get rid of build warning messages
Quiet unnecessary configure/qmake warnings when EPOCROOT is not set.
Add configure test for Maemo Internet Connection Daemon.
fix warning
...
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits)
Moc: Add support for rvalue references in signals and slots.
Add support for polyphonic greek
Fix build failure on WinCE.
Autotests: if you use X11 libs, you must link to X11 libs explicitly.
Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
Compile Phonon in C++0x mode.
Compile Qt in C++0x mode.
Avoid a data relocation by not trying to store a pointer in the .data section of plugins.
Fix cast-from-ascii warning
Fix compilation on Linux
Fix compilation with WINSCW: #include doesn't find files in the same dir
Rename m_volume to m_vol
Add 2 signals, introduce side widget, make it possible to reset startId
Do not create native window handle just because a parent has one.
Tab color fix for document mode on Snow Leopard.
Revert "Don't emit open signal on session close/error."
Rename networkAccess property to networkAccessible.
Don't emit open signal on session close/error.
Rename private signal.
Autotest: fix instability by accepting rounding errors
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is not valid in C++0x:
char str[] = { 128, 0 };
Because 128 cannot be represented in a char. The same applies to
conversion from int to qreal: it's a narrowing conversion, with
possible data loss.
More info: http://www2.research.att.com/~bs/C++0xFAQ.html#narrowing
Reviewed-by: Trust Me
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The window frame/toolbar color is different (a bit lighter) for snow leopard,
so we need to adjust the tab color in document mode .
Reviewed-by: Richard Moe Gustavsen
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Kai Koehne
|
| | | | | | |
|
| | | | | | |
|
| |\ \ \ \ \
| |/ / / /
|/| | | | |
|
| | | | | | |
|
| |\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/gui/kernel/qapplication.cpp
src/gui/text/qtextlayout.cpp
src/openvg/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
tools/runonphone/main.cpp
tools/runonphone/serenum_unix.cpp
qtextlayout.cpp fixed up together with Eskil.
Kept the configure.exe from 4.7 without recompile.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In QS60Style, all itemviews should indicate selection/multiselection
with tick mark. Unfortunately it now uses object casting to QListView
currently to check the viability of widget to have tick mark. Thus,
it fails for QTreeViews and QTableViews.
Changing object casting to QAbstractItemView to support all item views.
Task-number: QTBUG-9212
Reviewed-by: Alessandro Portale
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QS60Style asserts that a given index is correct when setting theme
colors. Unfortunately it uses less-and-equal-to operator ('<='), which
is incorrect. It should use less-than ('<')operator, otherwise the
assert fails when index is equal to number of items in the color
table.
Task-number: QT-3078
Reviewed-by: Alessandro Portale
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix QTabBar scroll button arrow position in Windows mobile style
Revert "Optimize getting bearings of a glyph on Windows for true type fonts"
stabilize tst_QAccessibility::comboBoxTest
Better handling for NOTIFY in QGraphicsWidget regarding geometry changes
Add NOTIFY to size property so QML bindings are working fine.
Implement Q_PRIVATE_PROPERTY that allows you to declare properties
fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-8757
Reviewed-by: thartman
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-8757
Reviewed-by: thartman
|
