diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-08 07:09:26 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-08 07:09:47 +0100 |
commit | 3ec31ef9c5acd57a4a59c0d5f5e20b8d9a19bfa1 (patch) | |
tree | 8b55dd13dbc2a33fe7c857f622e10b817386bdb3 /tests/manual | |
parent | 6f87f2d23fb50d8183ea173fe423b7e1a24c0e2e (diff) | |
parent | 4ad8798de428b44fe4c56e1ca111940068056c57 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I2532c7f7db5e6cc3ef09753d886279816dd662b2
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/dialogs/dialogs.pro | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tests/manual/dialogs/dialogs.pro b/tests/manual/dialogs/dialogs.pro index 21ebf9b622..d765b8cf05 100644 --- a/tests/manual/dialogs/dialogs.pro +++ b/tests/manual/dialogs/dialogs.pro @@ -1,11 +1,20 @@ QT += core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport + +greaterThan(QT_MAJOR_VERSION, 4) { + QT += widgets + qtHaveModule(printsupport): QT += printsupport +} TARGET = dialogs TEMPLATE = app SOURCES += main.cpp filedialogpanel.cpp colordialogpanel.cpp fontdialogpanel.cpp \ - wizardpanel.cpp messageboxpanel.cpp printdialogpanel.cpp utils.cpp + wizardpanel.cpp messageboxpanel.cpp utils.cpp HEADERS += filedialogpanel.h colordialogpanel.h fontdialogpanel.h \ - wizardpanel.h messageboxpanel.h printdialogpanel.h utils.h -FORMS += printdialogpanel.ui + wizardpanel.h messageboxpanel.h utils.h + +!contains(DEFINES, QT_NO_PRINTER) { + SOURCES += printdialogpanel.cpp + HEADERS += printdialogpanel.h + FORMS += printdialogpanel.ui +} |