Commit 8512f1ed authored by Marco Bubke's avatar Marco Bubke

QmlDesigner: Don't show the dock icon for the puppet anymore

parent 0d6d4207
......@@ -11,18 +11,18 @@ Licensees holding valid Qt Commercial licenses may use this file in accordance w
GNU Lesser General Public License Usage
Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation and appearing in the file LICENSE.LGPL included in the packaging of this file. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>@TYPEINFO@</string>
<key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string>
<key>CFBundleIdentifier</key>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>@TYPEINFO@</string>
<key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string>
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator.qmldump</string>
<key>CFBundleVersion</key>
<string>2.1.80</string>
<key>CFBundleShortVersionString</key>
<string>2.1.80</string>
<key>CFBundleVersion</key>
<string>2.1.80</string>
<key>CFBundleShortVersionString</key>
<string>2.1.80</string>
<key>LSUIElement</key>
<string>1</string>
</dict>
......
......@@ -49,15 +49,21 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
m_localServer->listen(socketToken);
m_localServer->setMaxPendingConnections(2);
QString applicationPath = QCoreApplication::applicationDirPath();
#ifdef Q_OS_MACX
applicationPath += "/qmlpuppet.app/Contents/MacOS";
#endif
applicationPath += "/qmlpuppet";
m_qmlPuppetEditorProcess = new QProcess(QCoreApplication::instance());
connect(m_qmlPuppetEditorProcess.data(), SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(processFinished(int,QProcess::ExitStatus)));
m_qmlPuppetEditorProcess->setProcessChannelMode(QProcess::ForwardedChannels);
m_qmlPuppetEditorProcess->start(QString("%1/%2").arg(QCoreApplication::applicationDirPath()).arg("qmlpuppet"), QStringList() << socketToken << "editormode" << "-graphicssystem raster");
m_qmlPuppetEditorProcess->start(applicationPath, QStringList() << socketToken << "editormode" << "-graphicssystem raster");
m_qmlPuppetPreviewProcess = new QProcess(QCoreApplication::instance());
connect(m_qmlPuppetPreviewProcess.data(), SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(processFinished(int,QProcess::ExitStatus)));
m_qmlPuppetPreviewProcess->setProcessChannelMode(QProcess::ForwardedChannels);
m_qmlPuppetPreviewProcess->start(QString("%1/%2").arg(QCoreApplication::applicationDirPath()).arg("qmlpuppet"), QStringList() << socketToken << "previewmode" << "-graphicssystem raster");
m_qmlPuppetPreviewProcess->start(applicationPath, QStringList() << socketToken << "previewmode" << "-graphicssystem raster");
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(deleteLater()));
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSHumanReadableCopyright</key>
<string>(C) 2008-2011 Nokia Corporation
Commercial Usage
Licensees holding valid Qt Commercial licenses may use this file in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia.
GNU Lesser General Public License Usage
Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation and appearing in the file LICENSE.LGPL included in the packaging of this file. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>@TYPEINFO@</string>
<key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string>
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator.qmlpuppet</string>
<key>CFBundleVersion</key>
<string>2.1.80</string>
<key>CFBundleShortVersionString</key>
<string>2.1.80</string>
<key>LSUIElement</key>
<string>1</string>
</dict>
</plist>
......@@ -14,6 +14,7 @@ include(../../rpath.pri)
include (../../plugins/qmldesigner/designercore/instances/instances.pri)
include (../../plugins/qmldesigner/designercore/exceptions/exceptions.pri)
CONFIG -= app_bundle
SOURCES += main.cpp
OTHER_FILES += Info.plist
macx:QMAKE_INFO_PLIST = Info.plist
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment