Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

src/app/Info.plist

@@ -21,6 +21,8 @@
 		<dict>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
+			<key>CFBundleTypeIconFile</key>
+			<string>qtcreator.icns</string>
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>pri</string>

src/libs/utils/utils.pro

@@ -29,7 +29,9 @@ SOURCES += reloadpromptutils.cpp \
     uncommentselection.cpp \
     parameteraction.cpp \
     treewidgetcolumnstretcher.cpp \
-    checkablemessagebox.cpp
+    checkablemessagebox.cpp \
+    styledbar.cpp
+
 win32 { 
     SOURCES += abstractprocess_win.cpp \
         consoleprocess_win.cpp \
@@ -66,7 +68,9 @@ HEADERS += utils_global.h \
     parameteraction.h \
     treewidgetcolumnstretcher.h \
     checkablemessagebox.h \
-    qtcassert.h
+    qtcassert.h \
+    styledbar.h
+
 FORMS += filewizardpage.ui \
     projectintropage.ui \
     newclasswidget.ui \

src/plugins/projectexplorer/projectexplorer.pri

 include(projectexplorer_dependencies.pri)
-
 LIBS *= -l$$qtLibraryTarget(ProjectExplorer)