diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-08-10 16:03:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-08-10 16:03:57 +0200 |
| commit | 99ba300ae3ab8776a39a987dc45c9c7afe75b493 (patch) | |
| tree | f1389a0980ecd0a549ebcccc54600c3ae04d6f06 /src/libs/libs.pro | |
| parent | 01bb7443fdb848899fef41e9f661a455e2e6e4ee (diff) | |
| parent | d78d7dbce3d4a85e7f111db719dde0b943814575 (diff) | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
src/libs/libs.pro
src/plugins/debugger/watchwindow.cpp
src/plugins/remotelinux/maemopackagecreationstep.h
Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
Diffstat (limited to 'src/libs/libs.pro')
| -rw-r--r-- | src/libs/libs.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/libs.pro b/src/libs/libs.pro index f963d67801..658fc3fe99 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -15,7 +15,8 @@ SUBDIRS = \ qmljs \ qmljsdebugclient \ glsl \ - qmleditorwidgets + qmleditorwidgets \ + qtcomponents/styleitem # Windows: Compile Qt Creator CDB extension if Debugging tools can be detected. win32 { |