blob: 05b62931d8f2d81bf83e6231c1dc39cb3b7b71f8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
From 1dfdb058c0270d6bff523eecccb51d20bb1fec46 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Wed, 15 Dec 2010 07:33:19 +0100
Subject: [PATCH] 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.
---
qtscript/src/plugins/script/qtdbus/qtdbus.pro | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/qtscript/src/plugins/script/qtdbus/qtdbus.pro b/qtscript/src/plugins/script/qtdbus/qtdbus.pro
index 18663bb..d3b5dfd 100644
--- a/qtscript/src/plugins/script/qtdbus/qtdbus.pro
+++ b/qtscript/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
--
1.7.5.rc2.4.g4d8b3
|
