feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,241 Commits 108 Branches 368 Tags
c20c20f01277d1d0f7e452ee6ad7fd5f2bc34f3d
Commit Graph

3748 Commits

Author SHA1 Message Date
Marco Bubke
a980ea98bb QmlDesigner: Add a special root item of the view too 
Change-Id: Ie7cc58d3793717fce979ccd554060b91bc0d7040
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 18:49:55 +02:00
Marco Bubke
a5c3c9af0e QmlDesigner: Do the dirty test only for non node instances 
The test should stop at the next node instance.

Change-Id: I99daf1215edea34b36434720c44ea7844c4bef34
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 18:49:32 +02:00
Eike Ziller
6cfeeee117 Welcome: Fix up the dynamic layout fix 
Change-Id: Icb068bd4522a7014a6dd48804245086a452a639d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-24 18:37:58 +02:00
Anton Kalmykov
496cfdd21d Add syntax highlight for primitive data types 
Syntax highlight rules for keywords are changed to highlight control
keywords and primitive data types separately.

Change-Id: Ifb25be7a97b92589030aa190641320c233dc7f2d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-06-24 15:44:13 +02:00
Eike Ziller
79bd453feb Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	src/plugins/winrt/winrtruncontrol.cpp
	src/plugins/winrt/winrtruncontrol.h

Change-Id: Idad0558e53e23debee8523586b681af4705e97f6
 2014-06-24 14:52:00 +02:00
Thomas Hartmann
1fd6a4a80a QmlDesigner.PropertyEditor: Fix GeometrySection 
This fixes a regression introduced by
commit 1da0d018c2.

Task-number: QTCREATORBUG-12501
Change-Id: I96dd1c19afa6b6b0a56ef5f6ea5e01272aa1b774
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 12:29:46 +02:00
Eike Ziller
8fc7035b18 Help: Open example documentation in extra window 
Also remove the hack that HelpManager::handleHelpRequest looks
for ?view=split in the URL and use an enum instead.

Change-Id: I4ad74775381cf0b321181358266d8e89c6e277b5
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2014-06-24 11:22:20 +02:00
hjk
281aa9e0d6 Debugger: Add personaltypes.py as default location for local additions 
Change-Id: Ib393258970f04f2e829f959adedfbc588a966a10
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-24 09:41:16 +02:00
Marco Bubke
826525f89f QmlDesigner: Add item library section visibility 
Search is working again

Change-Id: Ie6d52f476e2b9b5c3256bc289bcdd5dcadafea93
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-23 22:23:02 +02:00
Marco Bubke
44685b535d QmlDesigner: Promote visibility changes of item library items 
Change-Id: Ie4b70a2785fbd9199a81ffaf879f521431aa609d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-23 22:22:48 +02:00
Orgad Shaneh
4494e74ae7 QmlDesigner: Fix "unused argument" compiler warnings 
Change-Id: Ibfdd61069183a80b322674376200d92d11c06a41
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-23 15:30:18 +02:00
Thomas Hartmann
6f51d76cd4 WelcomePage: Taking text sizes into account for layout 
Buttons do not have a fixed width of 160px anymore
and the sidebar layout becomes dynamic.

Task-number: QTCREATORBUG-12108
Task-number: QTCREATORBUG-12091
Change-Id: I940b4b7c9c79a312766501559147abb85833b78f
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-06-23 14:30:47 +02:00
Marco Bubke
cc68534e06 QmlDesigner: More quadratic size of item library delegates 
Change-Id: Ie16f486fbe873fbec6663ac965e244c59c0e0e6b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-23 14:10:33 +02:00
Tim Jenssen
5df2389970 QmlDesigner: rewrite itemlibrary 
Change-Id: I31344f7cfa56ae5dd6662bef4e449007b7ec3ec4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-19 18:07:47 +02:00
Tim Jenssen
1da0d018c2 QmlDesigner: prepare Sections for use as a delegate 
Change-Id: Ieeddea3d813f13cb7018d6611156f1f98b69e6be
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-19 18:07:29 +02:00
Tim Jenssen
30780640ad QmlDesigner: remove ugly pixel line from scrollbar 
Change-Id: Ib553128667a85abadfe9b810860b0f7a68499bed
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-19 18:06:57 +02:00
Pavel Fric
a0ca5f645d Update Czech translation 
Change-Id: I1531b1362628916c5f992a69254db0b47e028759
Reviewed-by: Vojtech Kral <vojtech@kral.hk>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-06-19 16:57:23 +02:00
hjk
9968271d3f Debugger: Streamline gdb.Value field access workarounds 
Change-Id: I1b3b81019f6861353e5ada350fadbe3c8734f186
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-19 14:14:16 +02:00
Tim Jenssen
115620aabc QmlDesigner: cleanup unused methods 
- remove javascript methods: scrollView(delta), resetView()
 - remove javascript related signals
 - remove visibleCount debug output

Change-Id: I63b0a204d7f570986e41fc9fb3762f13e5d63d79
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-18 16:53:51 +02:00
Tim Jenssen
a850dc2033 QmlDesigner: move ScrollViewStyle to common directory 
Change-Id: Ieb235aab921bd5d246403ff42b4659090c8abdbf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-18 16:53:34 +02:00
Thomas Hartmann
95bcd0883f QmlDesigner.PropertyEditor: Fix TextEditSpecifics 
I moved the property format into Text section, because
having two sections with even the same name was confusing.
The format property also is not really related to "Text Input".

Since the distinction between plain and rich text is very important,
it makes sense to have this property in the first section.

Change-Id: I4d66ed4a24fe0d99d394c17d149c830db2c6d3b8
Task-number: QTCREATORBUG-12452
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 16:41:34 +02:00
Marco Bubke
59e4bc9112 QmlDesigner: Add PuppetAlive command 
The puppet can be dead but we don't now. Now the puppet is sending a alive
signal. If the signal is not arriving anymore we restart the puppets.

Task-number: QTCREATORBUG-12434
Change-Id: I90edab6a45f95950fd764adcb125068659d5354b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 15:00:12 +02:00
Eike Ziller
514087487d Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2014-06-18 14:25:03 +02:00
Eike Ziller
cbf4de0315 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: I1bad0c1477d7fd6996c0f8ca82e76ba521bc0dcc
 2014-06-18 14:20:58 +02:00
Marco Bubke
854a0f25a1 QmlDesigner: Fix recursive all item function 
Change-Id: I074201639a9fcac40d9c3ca4bb50be46edb88957
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:30:00 +02:00
Marco Bubke
6cee8a42ff QmlDesigner: Add test if the instance exists 
Change-Id: I03f7e32aa0eda1f493c24ba174c706f4b8b0442c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:08:41 +02:00
Marco Bubke
029cd279c3 QmlDesigner: Don't try to access invalid node instances 
Task-number: QTCREATORBUG-12444
Change-Id: I021e9669137de51c8feb0d7227d6d4c65a4d710c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:08:34 +02:00
Marco Bubke
87e518ab53 QmlDesigner: Improve NodeInstanceServer::hasInstance 
Test if instance is valid.

Change-Id: I748f3f95a2ad0669899e8029fdde4de0658ad11b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:08:26 +02:00
hjk
e3979fe09d Debugger: Make dumper work with GDB 7.7 
GDB 7.7 changed behavior e.g. for the names of anonymous fields,
we need to adjust dumpers and some tests.

Change-Id: I25ae32cc56c4ff63b677a04d6ed9c250e0252140
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-18 12:17:42 +02:00
Eike Ziller
232024253f Examples: Support new mainFile attribute 
Qt 5.3 adds a mainFile="yes" attribute to the fileToOpen tag for the
file that should be visible after opening the files.

Change-Id: I3ff67e514a16811cc730633e0fbcc470c4e54e5e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-06-17 16:48:05 +02:00
Thomas Hartmann
594b184bb1 QmlDesigner.PropertyEditor: Fixing size of ScrollArea 
When evaluating Component.onCompleted the childrenRect.height
was not properly set, yet.

Instead we use onChildRectHeightChanged.

Change-Id: I68f395555fbfccccea35fab4387dcc23ca7f1a92
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-17 11:33:14 +02:00
hjk
a63ed31b9b Debugger: Fix base class name printing for GDB/CLI 
Change-Id: Ib007c9d0035387018acd608d67d4a9632c17ab8b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-17 09:04:41 +02:00
hjk
e483ae53ec Debugger: Better putAddressRange fallback 
Change-Id: I401d7c184465c117cf4506f55fc911766d41052e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-17 08:56:24 +02:00
hjk
b51ec79f7c Debugger: Remove some debugging output 
Change-Id: I4df8bd423bfce6b3005c5821ea71358a8ac260ea
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-17 07:42:21 +02:00
hjk
fffbf9472a Debugger: Make dumpers somewhat work in command line GDB 
With

    python sys.path.insert(1, '/data/dev/creator/share/qtcreator/debugger/')
    python from gdbbridge import *

in .gdbinit there's a new "GDB command", called "pp".

With code like

    int main(int argc, char *argv[])
    {
        QString ss = "Hello";
        QApplication app(argc, argv);
        app.setObjectName(ss);
        // break here
    }

the 'pp' command can be used as follows:

(gdb) pp app
app =
   [
      <Myns::QGuiApplication> = {"Hello"}
      staticMetaObject = <Myns::QMetaObject> = {""}
      [parent] = <Myns::QObject *> = {"0x0"}
      [children] = <Myns::QObjectList> = {"<3 items>"}
      [properties] = "<>0 items>"
      [methods] = "<6 items>"
      [signals] = "<1 items>"
   ],<Myns::QApplication> = {"Hello"}

(gdb) pp app [properties],[children]
app =
   [
      <Myns::QGuiApplication> = {"Hello"}
      staticMetaObject = <Myns::QMetaObject> = {""}
      [parent] = <Myns::QObject *> = {"0x0"}
      [children] = [
         <Myns::QObject> = {""}
         <Myns::QObject> = {""}
         <Myns::QObject> = {"fusion"}
      ],<Myns::QObjectList> = {"<3 items>"}
      [properties] = [
         windowIcon = <Myns::QVariant (QIcon)> = {""}
         cursorFlashTime = <Myns::QVariant (int)> = {"1000"}
         doubleClickInterval = <Myns::QVariant (int)> = {"400"}
         keyboardInputInterval = <Myns::QVariant (int)> = {"400"}
         wheelScrollLines = <Myns::QVariant (int)> = {"3"}
         globalStrut = <Myns::QVariant (QSize)> = {"(0, 0)"}
         startDragTime = <Myns::QVariant (int)> = {"500"}
         startDragDistance = <Myns::QVariant (int)> = {"10"}
         styleSheet = <Myns::QVariant (QString)> = {""}
         autoSipEnabled = <Myns::QVariant (bool)> = {"true"}
      ],"<10 items>"
      [methods] = "<6 items>"
      [signals] = "<1 items>"
   ],<Myns::QApplication> = {"Hello"}

(gdb) pp ss
ss =
   <Myns::QString> = {"Hello"}

Change-Id: I6e4714a5cfe34c38917500d114ad9a70d20cff39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-16 16:28:59 +02:00
hjk
ff2c4a28f2 Debugger: Add dumper for QStringData, QHashedString and QQmlRefCount 
Change-Id: I252f532d2f67519ebc1ea45353579408bee91c59
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-16 15:01:09 +02:00
Thomas Hartmann
f3270472ee QmlDesigner.NodeInstances: blacklist QtMultimedia/Audio 
Change-Id: I7d16ae74ea848e848ac6dc2d8c8bb9c468681889
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-12 18:07:03 +02:00
Tim Jenssen
ef87889b63 QmlDesigner: add reload feature to item library view 
Change-Id: Ib71dc235abd059056063c5d9b9072c8bdc932762
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-06-11 14:13:22 +02:00
Thomas Hartmann
94887ce539 QmlDesigner.StatesEditor: Fixing capitalization of qml file 
Change-Id: Idb6e2bcb787a8ff3b5d26330a1ced1f930f0bc1d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-11 14:12:34 +02:00
Tim Jenssen
515c77e8d7 QmlDesigner: move the beauty bottom rect inside the scrollview 
Change-Id: I3cb85c6d7e9e259db7f4af28083d53539e5631b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-06-11 13:11:43 +02:00
Thomas Hartmann
c5dad0f638 QmlDesigner.StatesEditor: Adding context menu to collapse the view 
Change-Id: I5c118281ec8b9b3ef059e668ed4f534b70f952e1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-06 15:31:57 +02:00
Thomas Hartmann
6d1ae0e268 QmlDesigner.StatesEditor: Small adjustments to styling 
Fine tuning of the styling and some minor adjustments.
The TextFields for the state names are always visible now.

Change-Id: I617085bb08fd4bb0e926610b1c3f3020db3c68a8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-06 15:31:52 +02:00
Thomas Hartmann
33f5be4c08 QmlDesigner.PropertyEditor: Use QmlModelNodeProxy in FileResourcesModel 
Before the code was abusing the anchoring backend.

Change-Id: I716c5cfa7a5c72d500cb5ae8c943c52f84c60e91
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-06-05 15:22:04 +02:00
Marco Bubke
785f98b98a QmlDesigner: Fix margin in the states list 
Change-Id: I322dea23a598d7069e672920cb494eea8e697495
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-05 14:28:09 +02:00
hjk
a216d5445f Debugger: Fix operation with python 2.6 
Change-Id: Iecfea8f6e1531228fd6cccc424ee4c6c2036098e
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
 2014-06-04 14:35:31 +02:00
hjk
d57bb24354 Debugger: Better fall back for LLDB without remote support 
Change-Id: I517052bb795674d4beda05e3909dc05afc99bfe3
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-03 17:07:03 +02:00
hjk
60f5b5afc5 Debugger: Fail more gracefully on "ill" LLDB engines 
Less need to use the hard Debug->Abort

Change-Id: Ib019792063924549ace58a63ccef994dbfaa00dc
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-03 17:06:43 +02:00
hjk
be25be4705 Debugger: Better handling of the tabbed extra views 
Closing with the [x] now resets the Display mode of the associated
iname, and the view hides if there are no visible tabs left.
Also, remove the long-unused DisplayProcess format.

Change-Id: Ibd3308549af75e345c672c07f6714d26e7196e5a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-03 10:53:01 +02:00
Eike Ziller
37ab6e6d03 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	src/shared/qbs

Change-Id: Ie56c48d3bcd42e1a15832c5e7a10fe69c5410d90
 2014-06-02 12:22:03 +02:00
hjk
a9e1eef089 Debugger: Limit QObject name dumper to a more-than reasonable maximum 
GDB can crash on to big chunks. Since this here is a convenience
feature only, hard-limiting it to length 200 seems ok as work-around.

Task-number: QTCREATORBUG-12330
Change-Id: Ia6ebf16f3528d91020d19851641f42c1e421fe15
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-30 13:34:25 +02:00