| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result
tests/auto/linguist/lupdate/testdata/good/lacksqobject/expectedoutput.txt
tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result
tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.result
tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
tests/auto/qcombobox/tst_qcombobox.cpp
tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp
tests/auto/xmlpatternsview/view/MainWindow.cpp
tests/auto/xmlpatternsview/view/TestCaseView.cpp
tests/auto/xmlpatternsview/view/TestResultView.cpp
tests/auto/xmlpatternsview/view/TreeSortFilter.cpp
tests/auto/xmlpatternsview/view/UserTestCase.cpp
tests/auto/xmlpatternsview/view/XDTItemItem.cpp
tests/auto/xmlpatternsview/view/main.cpp
tests/auto/xmlpatternsxqts/lib/ASTItem.h
tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h
tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h
tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h
tests/auto/xmlpatternsxqts/lib/Global.h
tests/auto/xmlpatternsxqts/lib/ResultThreader.h
tests/auto/xmlpatternsxqts/lib/TestBaseLine.h
tests/auto/xmlpatternsxqts/lib/TestCase.h
tests/auto/xmlpatternsxqts/lib/TestResult.h
tests/auto/xmlpatternsxqts/lib/TestResultHandler.h
tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h
tests/auto/xmlpatternsxqts/lib/Worker.h
tests/auto/xmlpatternsxqts/lib/XMLWriter.h
tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The subControlRect of the arrow and the listBoxPopup where assuming
the widget rect is at the origin.
Reviewed-by: Richard Moe Gustavsen
Reviewed-by: Pierre Rossi
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use the PM_TabBarTabHSpace instead of the hardcoded '6'
Use a spacing of 4px instead of 2px between the buttons and the text.
Reviewed-by: jbache
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
By making sure the computation in QTabBar::tabSizeHint and
QCommonStylePrivate::tabLayout are the same
Reviewed-by: jbache
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge all the code in a common layoutTab function
This commit only moves the code around and doesn't change any behavour.
The fixes for the broken layouts will go in another commit
Reviewed-by: jbache
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 259924
Reviewed-by: Andreas Aardal Hanssen
|
| | |
| | |
| | |
| | | |
Note: if this fails building on any platform, talk to Denis!
|
| | |
| | |
| | |
| | |
| | |
| | | |
Changed QSize to QSizeF
Reviewed-by: Trust Me
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is more in accordance with touch points, and graphics view
Rev-By: Discussed with Denis and Brad
|
| | | |
| | | |
| | | |
| | | | |
Rev-By: denis
|
| | | | |
|
| | | | |
|
| |/ /
| | |
| | |
| | |
| | | |
Task-number: 155124
Reviewed-by: Trust Me
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the paint engine used by QGLWidgets was the GL 2 paint engine the
backing store assumed partial update support, which is not the case. We
need to check for both QPaintEngine::OpenGL and QPaintEngine::OpenGL2.
Reviewed-by: Trond
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Windows IME supports reconversion of text. e.g. On a Japanese layout,
up on pressing the HENKAN key a list of choices for the current word are
shown in a popup. This patch adds that support to Qt. We will select the
current word in the widget and the choices are shown as in the editing
mode.
Task-number:225588
Reviewed-by: axis
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: 182860
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This means it should respect the order that was defined with
insertItem() and addItem().
Note that this is not strictly necessary (as now explicitly written in
the docs for QGraphicsLayout::itemAt()), but commit
2ec56d158dc140f68efb45e2e0613f0e4026ddf6 broke the order and for people
that relied on this that commit caused a regression.
In addition, after commit 2ec56d158dc140f68efb45e2e0613f0e4026ddf6 it
was not longer possible to query the "item at visual index". Thus,
instead of adding another function (like QGGL::itemAt(int,int)) we make
sure that itemAt() also returns the "item at visual index".
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
It was initialized correctly though, just that some compilers could not
see that.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Check if QTabBarPrivate's movingTab member is 0 before dereferencing it.
This fixes a crash when double-clicking a tab. New unit test included.
http://bugs.kde.org/show_bug.cgi?id=202767
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
Merge-Request: 1337
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This just caused too much problems and must be solved another way.
In qfsfileengine_win.cpp we define FSCTL_GET_REPARSE_POINT and all
of the other stuff that's needed for NTFS symlink support, if
its not defined. This is the case if _WIN32_WINNT is less
than 0x0500.
All other changes in this commit are just reversions of commits
that were done for the infamous qglobal.h change.
Discussed with prasanth, tested by pulse.
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |/ /
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously we were using QPaintEngine::syncState() which is not ideal
naming-wise, since it actually prepares for native painting instead of
syncing the painter's state to native state.
Reviewed-by: Trond
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If you do a selection with the mouse and react to selectionChanged by
changing the selection. Those changes would be overwritten by
QAbstractItemView::mouseReleaseEvent.
It is useless to set the selection on mouse release. We already do
that on mouse press.
Task-number: 250683
Reviewed-by: ogoffart
|
| | |
| | |
| | |
| | | |
Reviewed-by: Kavindra
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If GetTextMetrics() should fail, the results are undefined. When the
undefined data are used, e.g. when painting text, this can cause a
crash. To avoid the crash and make it clear that the metrics cannot be
retrieved, we zero out the entire structure.
Task-number: 251172
Reviewed-by: gunnar
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The extra ".data()" call is not needed here because QScopedPointer
overloads operator!() to do the right thing here.
Reviewed-by: Eskil Blomfeldt
|
| | |
| | |
| | |
| | | |
Reviewed-by: janarve
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously it wouldn't and the layout could appear to be broken.
Task-number: 248817
Reviewed-by: Gabriel De Dietrich
|
| | |
| | |
| | |
| | |
| | |
| | | |
classes
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | | |
The member need to be initialized in the same order as in which they are declared
Reviewed-by: Thierry
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Lots of warnings in the qreal == float case.
Some Q_UNUSED added.
Reviewed-by: thartman
|
| | |
| | |
| | |
| | | |
Reviewed-by: hjk
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We now need to connect to the slot in the QLineControl and not to the
slot of the QLineEdit (the QLineEdit slot is now also removed).
Reviewed-by: Alan Alpert
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Why this happends is a bit blurry. From before, I know that
cocoa is a bit buggy regarding setting a menu item
hidden or not. The solution back then resulted in the function
syncNSMenuItemEnabled in qmenu_mac.mm. This patch basically
applies the same (silly) trick; disabling the menuitem before
enabling it. This seems to force an update to the menu items
enabled state. For the record: this is not a fix that I
embrace. I hope we can remove it again some day. See
task for how to reproduce.
Task: 259600
Rev-By: alexis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Had left the cursor flash time as half the QApplication cursor flash
time by mistake. The new function sets the whole period and not just the
time between toggling cursor visibility.
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem was that the mode was not emitting dataChanged.
Note: This still needs to be autotested.
Task-number: 234641
Reviewed-by: ogoffart
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ItemIsPanel allows items that act like windows. They can be
activated and deactivated just like windows and focus is handled
just like with windows. The main difference is that panels are
more light-weight. There's less built-in functionality (e.g.,
clicking a panel doesn't automatically activate nor raise it).
This patch also introduces QGraphicsItem::panel(),
QGraphicsItem::isPanel(), and QGraphicsItem::isActive(),
as well as QGraphicsScene::activePanel(),
QGraphicsScene::setActivePanel(). and QGraphicsScene::isActive().
Regular windows (QGraphicsWidgets with Qt::Window set) are
also panels, with added functionality. The ItemIsPanel flag is
set automatically for windows.
Reviewed-by: brad
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Had left the cursor flash time as half the QApplication cursor flash
time by mistake. The new function sets the whole period and not just the
time between toggling cursor visibility.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| | |
This will remove a false pmemleak under valgrind.
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| | |
QRectF::intersects was optimized as part of the Falcon project, and is
now a bit faster than the inline version used here (drawing of dashed
lines was measured to take 16% less time).
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|