diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-07-19 15:42:50 -0500 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-26 03:37:06 +0200 |
| commit | e2e7c9891be3bb92cf4044c1a3cba7a5dbc0d95e (patch) | |
| tree | 2d745aefa64f2600edb793ec3c4657795c1b78e2 /src/designer/src | |
| parent | 5f6b89cdc3313cf36b10932ef8c24cb15f103e7b (diff) | |
| download | qttools-e2e7c9891be3bb92cf4044c1a3cba7a5dbc0d95e.tar.gz | |
Don't use QT_BUILD_TREE anymore
Modules have their own variables to use for such things
If there's no way of getting to what you need outside of those,
you probably shouldn't be doing it in the first place.
Change-Id: I3e8d5f632ea377ec5dcb3eb0fe7dd27d2f4deb90
Reviewed-on: http://codereview.qt.nokia.com/1850
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/designer/src')
| -rw-r--r-- | src/designer/src/components/lib/lib.pro | 4 | ||||
| -rw-r--r-- | src/designer/src/components/propertyeditor/propertyeditor.pri | 4 | ||||
| -rw-r--r-- | src/designer/src/lib/lib.pro | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro index eb9d31cba..abfcf24ad 100644 --- a/src/designer/src/components/lib/lib.pro +++ b/src/designer/src/components/lib/lib.pro @@ -7,7 +7,7 @@ CONFIG += qt depend_prl no_objective_c designer QT *= gui-private QT *= uilib-private win32|mac: CONFIG += debug_and_release -DESTDIR = $$QT_BUILD_TREE/lib +DESTDIR = $$QT.designer.libs !wince*:DLLDESTDIR = $$QT.designer.bins QT += designer-private uilib-private @@ -26,7 +26,7 @@ QMAKE_TARGET_DESCRIPTION = Graphical user interface designer. #load up the headers info CONFIG += qt_install_headers -HEADERS_PRI = $$QT_BUILD_TREE/include/QtDesigner/headers.pri +HEADERS_PRI = $$QT.designer.includes/headers.pri include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) #mac frameworks diff --git a/src/designer/src/components/propertyeditor/propertyeditor.pri b/src/designer/src/components/propertyeditor/propertyeditor.pri index cd1b67e5a..6b095632b 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.pri +++ b/src/designer/src/components/propertyeditor/propertyeditor.pri @@ -1,7 +1,3 @@ -#the next line prevents non-shadowbuilds from including the same directory twice -#otherwise, the build command would be too long for some win32 shells. -!exists($$QT_BUILD_TREE/tools/designer/src/components/propertyeditor/propertyeditor.h):INCLUDEPATH += $$QT_BUILD_TREE/tools/designer/src/components/propertyeditor - INCLUDEPATH += $$PWD # --- Property browser is also linked into the designer_shared library. diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index 9c909df79..731c7acf5 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -9,7 +9,7 @@ QT += core-private gui-private xml uilib-private contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols CONFIG += qt win32|mac: CONFIG += debug_and_release -DESTDIR = $$QT_BUILD_TREE/lib +DESTDIR = $$QT.designer.libs !wince*:DLLDESTDIR = $$QT.designer.bins INCLUDEPATH += $$QT.designer.includes \ |