diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-01 09:56:19 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-01 10:05:21 +0100 |
commit | 91d1fc42d37501555fea3674b93f5fd81401b518 (patch) | |
tree | 5c9150606db89a00989d7a3450c287efbeb1b7cd /src/quicktemplates2/quicktemplates2.pri | |
parent | 8b5490c3acb2731cc5bf7b968128138d96259939 (diff) | |
parent | a19ab6806043591abf94868de6962a3747284da7 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ia4c692552e6573b33b2e0f6b43b2a482a78ad970
Diffstat (limited to 'src/quicktemplates2/quicktemplates2.pri')
-rw-r--r-- | src/quicktemplates2/quicktemplates2.pri | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/quicktemplates2/quicktemplates2.pri b/src/quicktemplates2/quicktemplates2.pri index 34fa001f..232d1db0 100644 --- a/src/quicktemplates2/quicktemplates2.pri +++ b/src/quicktemplates2/quicktemplates2.pri @@ -79,8 +79,6 @@ HEADERS += \ $$PWD/qquicktoolbutton_p.h \ $$PWD/qquicktoolseparator_p.h \ $$PWD/qquicktooltip_p.h \ - $$PWD/qquicktumbler_p.h \ - $$PWD/qquicktumbler_p_p.h \ $$PWD/qquickvelocitycalculator_p_p.h SOURCES += \ @@ -143,5 +141,12 @@ SOURCES += \ $$PWD/qquicktoolbutton.cpp \ $$PWD/qquicktoolseparator.cpp \ $$PWD/qquicktooltip.cpp \ - $$PWD/qquicktumbler.cpp \ $$PWD/qquickvelocitycalculator.cpp + +qtConfig(quick-listview):qtConfig(quick-pathview) { + HEADERS += \ + $$PWD/qquicktumbler_p.h \ + $$PWD/qquicktumbler_p_p.h + SOURCES += \ + $$PWD/qquicktumbler.cpp +} |