diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-19 03:18:51 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-19 03:18:51 (GMT) |
| commit | fd520c032eabab22acfabe9ffdc5929e168a279f (patch) | |
| tree | 9c5b3ecb9407b6aeeb7af48ba94a430aa1b4f8db /tools | |
| parent | d05ecf5998d8ef2b344f3763fbf97f7426336728 (diff) | |
| parent | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff) | |
| download | Qt-fd520c032eabab22acfabe9ffdc5929e168a279f.zip Qt-fd520c032eabab22acfabe9ffdc5929e168a279f.tar.gz Qt-fd520c032eabab22acfabe9ffdc5929e168a279f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/tools/assistant/assistant.pro | 2 | ||||
| -rw-r--r-- | tools/designer/src/designer/designer.pro | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/assistant/tools/assistant/assistant.pro b/tools/assistant/tools/assistant/assistant.pro index bc4d495..eb8cc51 100644 --- a/tools/assistant/tools/assistant/assistant.pro +++ b/tools/assistant/tools/assistant/assistant.pro @@ -15,7 +15,7 @@ DEPENDPATH += ../shared # ## Work around a qmake issue when statically linking to # ## not-yet-installed plugins -LIBS += -L$$QT_BUILD_TREE/plugins/sqldrivers +QMAKE_LIBDIR += $$QT_BUILD_TREE/plugins/sqldrivers HEADERS += aboutdialog.h \ bookmarkdialog.h \ bookmarkfiltermodel.h \ diff --git a/tools/designer/src/designer/designer.pro b/tools/designer/src/designer/designer.pro index 2050c72..8590c7b 100644 --- a/tools/designer/src/designer/designer.pro +++ b/tools/designer/src/designer/designer.pro @@ -14,10 +14,8 @@ INCLUDEPATH += \ ../lib/uilib \ extra -LIBS += -L../../lib \ - -L../../../../lib \ - -lQtDesignerComponents \ - -lQtDesigner +QMAKE_LIBDIR += ../../lib ../../../../lib +LIBS += -lQtDesignerComponents -lQtDesigner RESOURCES += designer.qrc |