Commit 97b3ef96 authored by con's avatar con
Browse files

Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

parents 5d0e9851 85214fe7
...@@ -13,13 +13,15 @@ win32 { ...@@ -13,13 +13,15 @@ win32 {
} }
linux-* { linux-* {
LIBS *= -lExtensionSystem -lAggregation LIBS *= -lExtensionSystem -lAggregation
QMAKE_LFLAGS+=-Wl,--enable-new-dtags QT += svg dbus
} }
TEMPLATE = app TEMPLATE = app
TARGET = $$IDE_APP_TARGET TARGET = $$IDE_APP_TARGET
DESTDIR = ../../bin DESTDIR = ../../bin
SOURCES += main.cpp SOURCES += main.cpp
macx { macx {
......
...@@ -283,3 +283,4 @@ int main(int argc, char **argv) ...@@ -283,3 +283,4 @@ int main(int argc, char **argv)
QTimer::singleShot(100, &pluginManager, SLOT(startTests())); QTimer::singleShot(100, &pluginManager, SLOT(startTests()));
return app.exec(); return app.exec();
} }
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