summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-01 10:58:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-01 10:58:17 (GMT)
commitc372896c5293633d75674a320a9b715a0501a42d (patch)
tree21a2aa8f4d6198de02a6de4c38944c02a6bcbb68
parentd576df623bf3071a8e4cf343c2dc768fa781c4ac (diff)
parent4fa516df73f50ee404dd52a178874edd797995fa (diff)
downloadQt-c372896c5293633d75674a320a9b715a0501a42d.zip
Qt-c372896c5293633d75674a320a9b715a0501a42d.tar.gz
Qt-c372896c5293633d75674a320a9b715a0501a42d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make sure the plugin target name is windows compliant
-rw-r--r--demos/arthurplugin/arthurplugin.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/demos/arthurplugin/arthurplugin.pro b/demos/arthurplugin/arthurplugin.pro
index 3114293..bc542fb 100644
--- a/demos/arthurplugin/arthurplugin.pro
+++ b/demos/arthurplugin/arthurplugin.pro
@@ -3,6 +3,7 @@ QTDIR = $$QT_SOURCE_TREE
CONFIG += designer plugin
TEMPLATE = lib
+TARGET = $$qtLibraryTarget(arthurplugin)
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
contains(QT_CONFIG, opengl) {