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:
	src/plugins/texteditor/texteditoractionhandler.cpp
This commit is contained in:
con
2010-05-11 13:39:21 +02:00
parent 17fd33bdab 626221b685
commit 3922be1b2e
84 changed files with 2578 additions and 1717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/qml/qmldesigner/coretests/coretests.pro
View File

@@ -5,7 +5,7 @@ QT += testlib \
script \
declarative
include($$CREATORDIR/src/plugins/qmldesigner/core/core.pri)
include($$CREATORDIR/src/plugins/qmldesigner/designercore/designercore.pri)
include($$CREATORDIR/src/libs/qmljs/qmljs-lib.pri)
HEADERS+=$$CREATORDIR/src/libs/utils/changeset.h
SOURCES+=$$CREATORDIR/src/libs/utils/changeset.cpp
@@ -16,7 +16,7 @@ DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB QTCREATOR_TEST
DEFINES+=QTCREATORDIR=\\\"$$CREATORDIR\\\"
DEPENDPATH += ..
DEPENDPATH += $$CREATORDIR/src/plugins/qmldesigner/core/include
DEPENDPATH += $$CREATORDIR/src/plugins/qmldesigner/designercore/include
TARGET = tst_qmldesigner_core