feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
This commit is contained in:
con
2010-06-30 14:25:09 +02:00
parent 82cc4b4302 21b211fed0
commit ede2a7c975
43 changed files with 13792 additions and 2543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/qmljs/qmljs-lib.pri
View File

@@ -5,6 +5,7 @@ contains(CONFIG, dll) {
}
include(parser/parser.pri)
include(../utils/utils.pri)
DEPENDPATH += $$PWD
INCLUDEPATH += $$PWD/..
@@ -23,6 +24,7 @@ HEADERS += \
$$PWD/qmljscompletioncontextfinder.h \
$$PWD/qmljscomponentversion.h \
$$PWD/qmljsmodelmanagerinterface.h \
$$PWD/qmljsrewriter.h
SOURCES += \
$$PWD/qmljsbind.cpp \
@@ -36,7 +38,8 @@ SOURCES += \
$$PWD/qmljslineinfo.cpp \
$$PWD/qmljscompletioncontextfinder.cpp \
$$PWD/qmljscomponentversion.cpp \
$$PWD/qmljsmodelmanagerinterface.cpp
$$PWD/qmljsmodelmanagerinterface.cpp \
$$PWD/qmljsrewriter.cpp
OTHER_FILES += \
$$PWD/parser/qmljs.g