diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-01-12 21:06:11 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:52 +0200 |
| commit | cfd040fa433ae388fd6d407067b7725bf9d17b9a (patch) | |
| tree | 8708a4160aa5e7da78a48ce9df2a109b8ab46014 /src/designer | |
| parent | bbb55ac56de12e3584514725362d045a47c3b41e (diff) | |
| download | qttools-cfd040fa433ae388fd6d407067b7725bf9d17b9a.tar.gz | |
Move uitools from QtTools to QtBase
Diffstat (limited to 'src/designer')
| -rw-r--r-- | src/designer/src/components/component.pri | 3 | ||||
| -rw-r--r-- | src/designer/src/components/lib/lib.pro | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/designer.pro | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/lib.pro | 3 | ||||
| -rw-r--r-- | src/designer/src/src.pro | 3 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/designer/src/components/component.pri b/src/designer/src/components/component.pri index c2fc10d9e..1dd8cf0b4 100644 --- a/src/designer/src/components/component.pri +++ b/src/designer/src/components/component.pri @@ -1,2 +1,3 @@ - +load(qt_module) TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end +INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro index 165315e77..852ec23d5 100644 --- a/src/designer/src/components/lib/lib.pro +++ b/src/designer/src/components/lib/lib.pro @@ -48,7 +48,7 @@ INCLUDEPATH += . .. \ $$PWD/../../lib/components \ $$PWD/../../lib/sdk \ $$PWD/../../lib/extension \ - $$PWD/../../lib/uilib \ + $$QT_SOURCE_TREE/tools/uilib \ $$PWD/../../lib/shared include(../propertyeditor/propertyeditor.pri) diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index 42cd345d7..b3de616b0 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -12,7 +12,7 @@ INCLUDEPATH += \ ../lib/sdk \ ../lib/extension \ ../lib/shared \ - ../lib/uilib \ + $$QT_SOURCE_TREE/tools/uilib \ extra QMAKE_LIBDIR += ../../lib ../../../../lib diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index 4e0e2b28f..a277f6133 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -59,7 +59,8 @@ mac:!static:contains(QT_CONFIG, qt_framework) { include(extension/extension.pri) include(sdk/sdk.pri) -include(uilib/uilib.pri) +include($$QT_SOURCE_TREE/tools/uilib/uilib.pri) +INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib include(shared/shared.pri) PRECOMPILED_HEADER=lib_pch.h diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro index 78665b751..40da11ffc 100644 --- a/src/designer/src/src.pro +++ b/src/designer/src/src.pro @@ -2,11 +2,8 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = \ - uitools \ lib \ components \ designer CONFIG(shared,shared|static):SUBDIRS += plugins - -symbian|wince*: SUBDIRS = uitools |