projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e0ba8fd
)
QDateTimeEdit: don't throw off auto-indention
author
Marc Mutz
<marc.mutz@kdab.com>
Mon, 22 Oct 2012 06:32:50 +0000
(08:32 +0200)
committer
The Qt Project
<gerrit-noreply@qt-project.org>
Mon, 22 Oct 2012 17:36:43 +0000
(19:36 +0200)
Reformulate #ifdef'ery involving {}s so as not to throw
off auto-indention of code editors due to unbalanced {}s.
Change-Id: I0f9858c78d0b6d923de75ca45c7d65ce3fa53e50
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
src/widgets/widgets/qdatetimeedit.cpp
patch
|
blob
|
history
diff --git
a/src/widgets/widgets/qdatetimeedit.cpp
b/src/widgets/widgets/qdatetimeedit.cpp
index
7868690
..
8a23530
100644
(file)
--- a/
src/widgets/widgets/qdatetimeedit.cpp
+++ b/
src/widgets/widgets/qdatetimeedit.cpp
@@
-990,10
+990,9
@@
QSize QDateTimeEdit::sizeHint() const
if (d->calendarPopupEnabled()) {
QStyleOptionComboBox opt;
d->cachedSizeHint = style()->sizeFromContents(QStyle::CT_ComboBox, &opt, hint, this);
- } else {
-#else
- {
+ } else
#endif
+ {
QSize extra(35, 6);
QStyleOptionSpinBox opt;
initStyleOption(&opt);