summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2010-12-15 07:33:19 +0100
committeraxis <qt-info@nokia.com>2011-04-27 12:05:48 +0200
commitc4b4891686c64ee333bd284a1913265bd26247d7 (patch)
tree25db77873d65b1a3cc8b5fc559be95bbc0c6f3f6
parentf9948baef6ba77489818cd16acb8d2e8892776ff (diff)
downloadqtscript-c4b4891686c64ee333bd284a1913265bd26247d7.tar.gz
Make QtScript main project file see dependencies properly and etc.
This allows for running make -j<n> without breaking. Also add examples to the compile. But two of them were disabled for now because they need QUiLoader.
-rw-r--r--src/plugins/script/qtdbus/qtdbus.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/script/qtdbus/qtdbus.pro b/src/plugins/script/qtdbus/qtdbus.pro
index 18663bb..d3b5dfd 100644
--- a/src/plugins/script/qtdbus/qtdbus.pro
+++ b/src/plugins/script/qtdbus/qtdbus.pro
@@ -1,11 +1,13 @@
+load(qt_module)
+
TARGET = qtscriptdbus
-include(../../qpluginbase.pri)
+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
QT = core gui script
CONFIG += qdbus
SOURCES += main.cpp
HEADERS += main.h
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/script
+DESTDIR = $$QT_BUILD_TREE/plugins/script
target.path += $$[QT_INSTALL_PLUGINS]/script
INSTALLS += target