Commit Graph

39805 Commits

Author SHA1 Message Date
Marco Bubke
cda1b6d246 Git: Use Core::AsynchronousMessageBox
Event loops can lead to crashes so it is better to use a dialog which has
not it's own event loop.

Change-Id: Ib703aad698f270b1fa491731adee131ad8b081e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 20:53:14 +00:00
Orgad Shaneh
e9a6e99011 Valgrind: Port to Qt5-style connect
Change-Id: If5f36bb262b932b60133d4301ab614311ce1feee
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 16:53:19 +00:00
Orgad Shaneh
5b22e292bc ProjectExplorer/Valgrind: Disambiguate signal name
error => processError

To make it easier to use Qt5-style connect

Change-Id: Idfa987512ebb7d1c1c02d3cd01b2d05088cbf38a
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 16:52:12 +00:00
Montel Laurent
250cc0640b Port to new connect api
Change-Id: Ifa29f380789c28cefda5dfdf497df42163fb2f94
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 16:15:04 +00:00
Nikolai Kosjar
478914a9ce CppTools: Unexport ProjectFileAdder
Change-Id: Icf53019b594a5c45b06f7f1fab0f4bf36e891918
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 16:08:26 +00:00
hjk
77db03a94d Debugger: Update watchers and return value views properly.
This was a regression after the watch model changes.

Change-Id: I4cf369d972b9a6e2f52800556acbd3711744724c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-09 16:07:00 +00:00
Lorenz Haas
711dbdec29 CppTools: accessSpecToString returns the plain name of AccessSpec
Change-Id: I840160a8f5b1c86d621f3334556a74ccb7176ba8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-09 15:54:19 +00:00
Lorenz Haas
cedd9bf5e6 CppEditor: Handle empty member base name in GenerateGetterSetter
Change-Id: I7b63f636520a9dcc8e6b62ab1b80181d023c478b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-09 15:54:06 +00:00
Lorenz Haas
5b3e26ad30 CppEditor: Remove all leading/trailing "_" for a variable's base name
Change-Id: Iea1aa4ca3f34d11d2e55ce56572c3b19af5743e3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-09 15:53:40 +00:00
Lorenz Haas
a51acf42ef CppEditor: Create only getter or setter member function
In addition to create both getter and setter member functions at once it
can now be decided to only create a getter or setter member function.

Task-number: QTCREATORBUG-13874
Change-Id: I9127a31b7d87dc91619abb2e2335bd8221f170a2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-09 15:53:22 +00:00
hjk
2fe69b60dd Debugger: Rework Tooltips. Again.
Too much layers of complexity. Instead of keeping an eye on
the "live" tree model and switch to a static StandardItemModel
whenever live synchronization is not possible (and do all the
tree view snake oil magic that's needed to make the switch
appear "smooth") keep static copies of relevant parts of the
live model, and update them whenever the the live model changes.

Change-Id: I88a7de67f7703cd2fed041351346b1c7ada0839e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 14:33:48 +00:00
Christian Stenger
d24fab71eb Utils: Avoid accessing null pointer...
...and make sure model is propagated when using copy constructor.

Change-Id: I95b95ebb7f6058adc73bc6e73b4f23a87012a2b2
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 14:04:06 +00:00
hjk
bca7015ce8 TreeModel: More sanity checks
Change-Id: I5f452c94ba4970cadda7840b8a5bcbe8871d84ac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-09 11:30:35 +00:00
Nikolai Kosjar
b1e36da139 GLSL: Remove unused RecursiveMemoryPool
Change-Id: Id9a94e095d6f316a947750d77246393c02db63ad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 11:20:37 +00:00
Nikolai Kosjar
9762afba60 C++: Remove unused RecursiveMemoryPool
Change-Id: I7009df49f79d8f895c5344f7be3558f7f3d35143
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 11:20:35 +00:00
Nikolai Kosjar
d8d03ad607 CppTools: Remove virtualness
Change-Id: I1ea9f755fe0fc7053e2fb209de9301bcb1a81739
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 11:20:31 +00:00
Nikolai Kosjar
40b0b4d748 CppEditor: Remove debug code
Change-Id: I93896fd018485716eae129f5f4d45a97f35b4a93
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 11:20:28 +00:00
Nikolai Kosjar
8fa3350570 CppEditor: Remove forwarding function
Change-Id: Iebc7b3c8e9cd119d95c15c723bad6e9782a956a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 11:20:21 +00:00
Nikolai Kosjar
d4dcef2fc1 C++: Remove unused FullySpecifiedType::copySpecifiers()
Change-Id: I1ea33f71a1b00cac06336bd0205e81b62d4d4b49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 11:20:14 +00:00
hjk
a4b2801fed TreeModel: Make TreeModelVisitor useful
Functions that are meant to be overridden should be virtual.
Also add a convience level() function, seems to be a common need.

Change-Id: I09d452ab12f0ac29fb31de853057511418a47e7e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-09 07:22:17 +00:00
Orgad Shaneh
10f36eada5 Gerrit: Support cancel in fetch context
Task-number: QTCREATORBUG-9743
Change-Id: Idf77d1d4efa5accb1aa00f61f495a3813704c934
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-07 16:42:24 +00:00
Orgad Shaneh
c6ccb096d6 Gerrit: Support cancel in query context
Task-number: QTCREATORBUG-9743
Change-Id: I106fefaee19e7ce39c1a501342d11fdf8d6b0acd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-07 16:42:00 +00:00
Christian Kandeler
f93e53f369 Update qbs submodule.
To HEAD of master branch.

Change-Id: I20fc7fafca9356e47c30e1095c7e89d96eaf2768
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-06 15:19:47 +00:00
Daniel Teske
b8c24b9c21 ProjectExplorer: Add abi for VxWorks
Change-Id: I62bf7a7c19e544307c676fb6fdf635e64cd4eba6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-06 14:48:09 +00:00
Christian Kandeler
d95775a54c Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I5409cd497e2380a5c1ea78e4c5de8e5d28fab97b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-06 14:29:34 +00:00
Montel Laurent
9d84476f2d Core: Revert change that broke focus on find
Change-Id: I6b7a6a84fdf6b57f7d0a34f8b2e239929e25a7e8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-06 14:24:17 +00:00
Orgad Shaneh
74ed591db3 Misc: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I919da493d0629b719d328e5e71c96a29d230dfd1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-06 12:20:28 +00:00
Orgad Shaneh
2f1509aa58 Designer: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: Iaf217428045831e279f826b18de0c0e53f57fc89
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-06 12:16:29 +00:00
hjk
4c63855f88 Debugger: Remove unused UpdateData::tooltipOnly member
Change-Id: I15c6f16a258c0d664d2378150c4b3277a29c4b5c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-06 12:06:28 +00:00
Orgad Shaneh
23b4dc128f ProjectExplorer: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I1d05d48b23f44e3d589cc2a790803714786b57d2
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-06 12:06:22 +00:00
Orgad Shaneh
779d6a8c4b Android: Fix namespace closing brace comment
Change-Id: I6ae4d7652db9d83c24009de9f59bd865c39db8bc
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-02-06 11:53:03 +00:00
Tim Jenssen
8df9c08dca remove unused return value
Change-Id: I92451d983f685df18651d700ed28a8eb275d2ea1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-02-06 11:39:20 +00:00
hjk
fbfafd0a01 Debugger: Remove unused UpdateParameters::tooltipExpression member
Change-Id: I61360b151ac8e6181b0635437468b4cd897c9ee8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-06 11:00:16 +00:00
Montel Laurent
dd8f2dda5c Port to new connect api
Change-Id: I31078e08f46892e94597f48fd27057a16039eb5a
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-06 10:48:28 +00:00
hjk
835f1fbcd8 Debugger: Merge GdbEngine::GdbCommand into DebuggerCommand
Mostly the timestamp and mechanical renaming.

Change-Id: I9a57302cba454b3c5cf6ce5c8279f817bf85cf2e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-06 09:41:37 +00:00
Orgad Shaneh
b556ba5002 TextEditor: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: Ief087658e2adc337ee02c49f0fb406597114df07
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-06 09:28:43 +00:00
Thomas Hartmann
69ac7f8d1e QmlDesigner.PropertyEditor: Adding support for LayoutProperties
Change-Id: Ie84517af3ce683505103bb9a868d7f2cbc2f2fdd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-06 09:20:33 +00:00
Orgad Shaneh
428565cb02 Core: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I5c6690f51488bf8ca3610ba9fb11e6e5fd814aaa
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-06 09:06:18 +00:00
Orgad Shaneh
f7835eb5f2 Android: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I44745947f315b73f0b983d4362f884580dc2d94b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-02-06 08:58:32 +00:00
Thomas Hartmann
e02a9433dd QmlDesigner.Puppet: define default values for Layout attached properties
Change-Id: Id81ad808e826813334c6f157331c21fe51dfe69c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-06 08:58:05 +00:00
Thomas Hartmann
bc2424c3c6 QmlDesigner: Adding test cases for layouting
Change-Id: Id06a24e1c17eea3f7e4d5231e68ade49cdf775f4
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-02-06 08:57:58 +00:00
hjk
968ba7b74d Debugger: Replace the QVariant callback cookies by direct parameters
Lambda makes it possible.

Change-Id: I26a4df71dcd24b76a4f0d6d67545b2e1c6ba2412
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-06 00:32:15 +00:00
hjk
d9e7a6e6af Debugger: Remove GdbCommand::callbackName
This was a debugging aid that has not been needed for a while.

Change-Id: Ia79e8e91b6648bdb807836443b01dd325d819640
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-05 22:31:06 +00:00
hjk
6a2d6b6d20 Debugger: Avoid some Gdb* in common type names
They had been created for use with GDB, but are more general
nowadays.

s/GdbResponse/DebuggerResponse/,
s/GdbResultClass/ResultClass, etc

Change-Id: Idfa3e280cdda882a8b3f02dff7e7d993e7e82d03
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-05 21:27:48 +00:00
Orgad Shaneh
2813643cfe IOS: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I8ef73f4861069dcd7edf5e73b397d60609d4b476
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2015-02-05 16:40:42 +00:00
Joerg Bornemann
4e09ec98c7 Utils: make FileInProjectFinder work with same file names
Consider having files with the same name in different subdirectories of
your project. The FileInProjectFinder will now choose the best matching
file path, which is the one that has the longest right-aligned common
substring with the path to find.

For the candidates
    ["/home/jim/MyProject/Resources/qml/1/foo.qml",
     "/home/jim/MyProject/Resources/qml/2/foo.qml"]
and the file path to find being "/SomeWhere/Else/qml/2/foo.qml" the
ranks are 8 and 10. Therefore, the second path is chosen.

Task-number: QTCREATORBUG-12908
Change-Id: I6225fd1dce8cc79a90d02ae0a54cdf80f75f45af
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-02-05 16:29:08 +00:00
Orgad Shaneh
a9454b3e55 VCS: Do not check uncheckable items on Select all...
... in the submit editor

Change-Id: I632195429390320836719cbdecf1aec22db08d2f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-05 14:14:20 +00:00
hjk
648a8e82f0 Debugger: Remove DebuggerCommand .arg chaining.
Less stylish options for more uniform user code.

Change-Id: Ie9a6558101383a844efa25ba3ab59b4b824ad89f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-05 14:12:19 +00:00
Orgad Shaneh
0da9178c3e Gerrit: Fix sorting by change number
Change-Id: I476bcfb38c6c0d48f6ff8102aa8f2876d89d167a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-05 14:09:10 +00:00
Tobias Hunger
96e3f258d6 JsonWizard: Document isBinary flag for the file generator
Task-number: QTCREATORBUG-13930
Change-Id: I3294919f83f0f4f3ee7e4473db7c1336f730c076
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-05 13:29:37 +00:00