diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-11-25 09:48:25 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-25 09:48:25 +0100 |
| commit | e2b0835b58aefdab91edda097c1180dae08058f6 (patch) | |
| tree | 5c26a165c4956d87b3d9cc5568b590276541f5e0 /src/libs/utils/utils.pro | |
| parent | 84aa93c2bbdd4b9e9bb84df78261abd343c07471 (diff) | |
| parent | 7ff81c435af06179fd64147a72f55e884e299cef (diff) | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljstypedescriptionreader.cpp
src/plugins/analyzerbase/startremotedialog.ui
src/plugins/qmldesigner/designercore/include/rewriterview.h
src/plugins/qt4projectmanager/makestep.cpp
Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
Diffstat (limited to 'src/libs/utils/utils.pro')
| -rw-r--r-- | src/libs/utils/utils.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro index f42fec090c3..5762de36313 100644 --- a/src/libs/utils/utils.pro +++ b/src/libs/utils/utils.pro @@ -3,7 +3,6 @@ TARGET = Utils QT += gui \ network -CONFIG += dll include(../../qtcreatorlibrary.pri) include(utils_dependencies.pri) |