Commit ef11c4e7 authored by Erik Verbruggen's avatar Erik Verbruggen
Browse files

Truned qmldump into an .app, and suppress its dock icon.

parent ad9ff8ed
...@@ -458,11 +458,15 @@ void ModelManager::loadQmlPluginTypes(const QString &pluginPath) ...@@ -458,11 +458,15 @@ void ModelManager::loadQmlPluginTypes(const QString &pluginPath)
static QString qmldumpPath; static QString qmldumpPath;
if (qmldumpPath.isNull()) { if (qmldumpPath.isNull()) {
QDir qmldumpExecutable(QCoreApplication::applicationDirPath()); QDir qmldumpExecutable(QCoreApplication::applicationDirPath());
#ifndef Q_OS_WIN #ifdef Q_OS_WIN
qmldumpPath = qmldumpExecutable.absoluteFilePath(QLatin1String("qmldump"));
#else
qmldumpPath = qmldumpExecutable.absoluteFilePath(QLatin1String("qmldump.exe")); qmldumpPath = qmldumpExecutable.absoluteFilePath(QLatin1String("qmldump.exe"));
#endif #else // !Q_OS_WIN
# ifdef Q_OS_MAC
qmldumpPath = qmldumpExecutable.absoluteFilePath(QLatin1String("qmldump.app/Contents/MacOS/qmldump"));
# else // !Q_OS_MAC
qmldumpPath = qmldumpExecutable.absoluteFilePath(QLatin1String("qmldump"));
# endif // Q_OS_MAC
#endif // Q_OS_WIN
QFileInfo qmldumpFileInfo(qmldumpPath); QFileInfo qmldumpFileInfo(qmldumpPath);
if (!qmldumpFileInfo.exists()) { if (!qmldumpFileInfo.exists()) {
qWarning() << "ModelManager::loadQmlPluginTypes: qmldump executable does not exist at" << qmldumpPath; qWarning() << "ModelManager::loadQmlPluginTypes: qmldump executable does not exist at" << qmldumpPath;
......
<?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-2010 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.qmldump</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>
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
TARGET = qmldump TARGET = qmldump
QT += declarative QT += declarative
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app TEMPLATE = app
...@@ -17,3 +15,6 @@ include(../../../../qtcreator.pri) ...@@ -17,3 +15,6 @@ include(../../../../qtcreator.pri)
include(../../../private_headers.pri) include(../../../private_headers.pri)
DESTDIR = $$IDE_BIN_PATH DESTDIR = $$IDE_BIN_PATH
include(../../../rpath.pri) include(../../../rpath.pri)
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