diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
| commit | c608ec825410a9287f544a2ae3ce8154424e767d (patch) | |
| tree | 39ee3d73d1e970bf808ecb9f1af8affc124199e1 /mkspecs/devices/blackberry-playbook-x86-qcc/qmake.conf | |
| parent | f5c6a5d06ba7b303f2999dd7a103c29282abfaa6 (diff) | |
| parent | 15a32435561a668e69764d12edfa2b5c564c6505 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qsavefile_p.h
src/corelib/tools/qregularexpression.cpp
src/gui/util/qvalidator.cpp
src/gui/util/qvalidator.h
Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
Diffstat (limited to 'mkspecs/devices/blackberry-playbook-x86-qcc/qmake.conf')
| -rw-r--r-- | mkspecs/devices/blackberry-playbook-x86-qcc/qmake.conf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/devices/blackberry-playbook-x86-qcc/qmake.conf b/mkspecs/devices/blackberry-playbook-x86-qcc/qmake.conf new file mode 100644 index 0000000000..054e634ac8 --- /dev/null +++ b/mkspecs/devices/blackberry-playbook-x86-qcc/qmake.conf @@ -0,0 +1,7 @@ +# +# qmake configuration for the Blackberry Playbook x86 +# + +include(../../blackberry-x86-qcc/qmake.conf) + +DEFINES += Q_OS_BLACKBERRY_TABLET |