summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-12-01 17:01:37 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2016-12-02 05:14:56 +0000
commit033eeff87015f6ffa1e6a73dcc6c8a20479511e4 (patch)
treebad7931418b164fc7b6890395c5c2a54ae58a660
parentdcc9a3fdbf14e14a40bed106a0af93e7134690d4 (diff)
downloadqtscript-033eeff87015f6ffa1e6a73dcc6c8a20479511e4.tar.gz
Port to new feature system
Build tools depending on feature 'textedit'. Fix warnings qtscript/src/scripttools/scripttools.pro:1: Cannot find feature qfeatures Change-Id: I96b403668164c4821cdebf1b13043e9f92c129ea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/scripttools/scripttools.pro3
-rw-r--r--src/src.pro5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index fb4343a..542af43 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -1,6 +1,3 @@
-load(qfeatures)
-requires(!contains(QT_DISABLED_FEATURES, textedit))
-
TARGET = QtScriptTools
QT = core-private
QT_PRIVATE = gui widgets-private script
diff --git a/src/src.pro b/src/src.pro
index e81b193..eb22a14 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,4 +1,7 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += script
-qtHaveModule(widgets): SUBDIRS += scripttools
+qtHaveModule(widgets): {
+ QT_FOR_CONFIG += widgets
+ qtConfig(textedit): SUBDIRS += scripttools
+}