projects / platform / upstream / qtdeclarative.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a5568a 0825d24)
Merge remote-tracking branch 'origin/stable' into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Sun, 26 Jan 2014 09:36:32 +0000 (10:36 +0100)
committerSimon Hausmann <simon.hausmann@digia.com>
Sun, 26 Jan 2014 09:36:32 +0000 (10:36 +0100)
Change-Id: If45606c96ef130588004598c560aa790373f0a78

1  2 
tests/auto/qml/debugger/debugger.pro patch | diff1 | diff2 | blob | history

diff --cc tests/auto/qml/debugger/debugger.pro
index 6838d01,98e4141..8013f46
--- 1/tests/auto/qml/debugger/debugger.pro
--- 2/tests/auto/qml/debugger/debugger.pro
+++ b/tests/auto/qml/debugger/debugger.pro
@@@ -3,8 -3,10 +3,10 @@@ TEMPLATE = subdir
  PUBLICTESTS += \
      qqmlenginedebugservice \
      qqmldebugjs \
+     qqmlinspector \
+     qqmlprofilerservice \
      qpacketprotocol \
 -#    qv8profilerservice \
 +#    qv4profilerservice \
  #    qdebugmessageservice \
      qqmlenginedebuginspectorintegrationtest \
      qqmlinspector \
Domain: UI Framework / Qt;