diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:07:30 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:07:30 +0200 |
| commit | 9871b41531d632105f1d11e3a9683b05061177c1 (patch) | |
| tree | ac360f8256db25c97206ddaeda81646e27575962 | |
| parent | db84d1737cb70244eef271b91d1cea61c3e76963 (diff) | |
| parent | 265a5a6e605c681ef9ba3683d7bc15d841bd4955 (diff) | |
| download | qtscript-9871b41531d632105f1d11e3a9683b05061177c1.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/script/script.pro
Change-Id: Id2abbacef830a9b553c269af907e12f2c10f8b40
| -rw-r--r-- | src/scripttools/scripttools.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro index 12d26a4..9b786ec 100644 --- a/src/scripttools/scripttools.pro +++ b/src/scripttools/scripttools.pro @@ -1,3 +1,6 @@ +load(qfeatures) +requires(!contains(QT_DISABLED_FEATURES, textedit)) + TARGET = QtScriptTools QT = core-private QT_PRIVATE = gui widgets-private script |