diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-05-23 17:57:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-24 18:04:44 +0200 |
| commit | a0857d28e01e3a5769ac8f106d088fde648161e8 (patch) | |
| tree | 43a618a92f4813f3d163db02253cb89e0b56f901 /src/private/private.pro | |
| parent | 7adbdc017982aec8645e152c7891ea51f84ff8ee (diff) | |
| download | qtquickcontrols-a0857d28e01e3a5769ac8f106d088fde648161e8.tar.gz | |
Enable padding as a grouped property
We want padding to be a grouped property as the
existing Margins property looks rather odd and
insconsistent.
Change-Id: I9e614f9161aaf01af200b19a1fb46a51beec6fb4
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/private/private.pro')
| -rw-r--r-- | src/private/private.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/private/private.pro b/src/private/private.pro index 16b6cf81..88ce0b04 100644 --- a/src/private/private.pro +++ b/src/private/private.pro @@ -9,7 +9,9 @@ HEADERS += \ $$PWD/qquickrangemodel_p.h \ $$PWD/qquickrangemodel_p_p.h \ $$PWD/qquickcontrolsettings_p.h \ - $$PWD/qquickwheelarea_p.h + $$PWD/qquickwheelarea_p.h \ + $$PWD/qquickpaddedstyle_p.h \ + $$PWD/qquickpadding_p.h SOURCES += \ $$PWD/plugin.cpp \ @@ -17,7 +19,8 @@ SOURCES += \ $$PWD/qquickspinboxvalidator.cpp \ $$PWD/qquickrangemodel.cpp \ $$PWD/qquickcontrolsettings.cpp \ - $$PWD/qquickwheelarea.cpp + $$PWD/qquickwheelarea.cpp \ + $$PWD/qquickpaddedstyle.cpp # private qml files QML_FILES += \ @@ -25,7 +28,6 @@ QML_FILES += \ TabBar.qml \ BasicButton.qml \ Control.qml \ - Margins.qml \ Style.qml \ style.js \ ModalPopupBehavior.qml \ |