Skip to content
Snippets Groups Projects
Commit d476c996 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

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

parents 18f93755 3873165e
Branches
Tags
No related merge requests found
......@@ -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>
......
......@@ -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 \
......
include(projectexplorer_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(ProjectExplorer)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment