diff options
| author | con <qtc-committer@nokia.com> | 2008-12-16 14:48:46 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2008-12-16 14:48:46 +0100 |
| commit | 97b3ef9676cbfdbb2dfd571eb34c42e69846d442 (patch) | |
| tree | d1664555771200bc6f0f9cd53de3d455dcf9d4cc | |
| parent | 5d0e9851f234db051ea7c08d843fd9f6adec1f20 (diff) | |
| parent | 85214fe734eab9b3308c3a60bf3161567894d5ee (diff) | |
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
| -rw-r--r-- | src/app/app.pro | 4 | ||||
| -rw-r--r-- | src/app/main.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/app/app.pro b/src/app/app.pro index 2cb354da49..52e53003f3 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -13,13 +13,15 @@ win32 { } linux-* { LIBS *= -lExtensionSystem -lAggregation - QMAKE_LFLAGS+=-Wl,--enable-new-dtags + QT += svg dbus + } TEMPLATE = app TARGET = $$IDE_APP_TARGET DESTDIR = ../../bin + SOURCES += main.cpp macx { diff --git a/src/app/main.cpp b/src/app/main.cpp index eedc9e1365..b8d4b9d4b4 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -283,3 +283,4 @@ int main(int argc, char **argv) QTimer::singleShot(100, &pluginManager, SLOT(startTests())); return app.exec(); } + |