feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
4255220c35414dee49ab1c1c48bb96d44e4a241a
qt-creator/share/qtcreator/qml/qmlobserver
History
dt 4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
2010-11-10 17:02:40 +01:00
..
content
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
images
QmlObserver: Fix QPainter warnings
2010-10-08 15:51:55 +02:00
crumblepath.cpp
QmlObserver: Fix QPainter warnings
2010-10-08 15:51:55 +02:00
crumblepath.h
Fixed copying files from share
2010-09-29 10:07:19 +02:00
crumblepath.qrc
QmlObserver: Fix QPainter warnings
2010-10-08 15:51:55 +02:00
deviceorientation_maemo5.cpp
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
deviceorientation.cpp
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
deviceorientation.h
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
Info_mac.plist
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
LGPL_EXCEPTION.TXT
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
LICENSE.LGPL
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
loggerwidget.cpp
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
loggerwidget.h
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
main.cpp
Merge remote branch 'origin/2.1'
2010-11-10 17:02:40 +01:00
proxysettings_maemo5.ui
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
proxysettings.cpp
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
proxysettings.h
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
proxysettings.ui
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
qdeclarativetester.cpp
QmlObserver: Fix compilation if no private headers are installed
2010-10-06 14:59:25 +02:00
qdeclarativetester.h
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
qml.icns
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
qml.pri
QmlObserver: Fix QPainter warnings
2010-10-08 15:51:55 +02:00
qmlobserver.pro
QmlApp: Only use QMLJSDEBUGGER define to activate qml debugging
2010-10-13 16:52:58 +02:00
qmlruntime.cpp
QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserver
2010-10-13 16:52:58 +02:00
qmlruntime.h
QmlJSDebugger: Remove reference to JSDebugger in QDeclarativeViewObserver
2010-10-13 16:52:58 +02:00
qmlruntime.qrc
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
recopts_maemo5.ui
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
recopts.ui
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00
texteditautoresizer_maemo5.h
QML Observer: Build together on runtime with debugging tools
2010-09-29 09:39:30 +02:00