diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-01 07:53:02 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-01 07:53:02 (GMT) |
| commit | ac36357a8aa2a33491d1c308ade0a63a89a6590e (patch) | |
| tree | 25ba95d4ff5df206379136e9d38bed895a98ee52 /src | |
| parent | 871bdaff6d7ae05571830ae87d9de6ef4e2cdb9f (diff) | |
| parent | c198bdcf486e7b518aef44fdcb9834c9cae807a8 (diff) | |
| download | Qt-ac36357a8aa2a33491d1c308ade0a63a89a6590e.zip Qt-ac36357a8aa2a33491d1c308ade0a63a89a6590e.tar.gz Qt-ac36357a8aa2a33491d1c308ade0a63a89a6590e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/s60/s60pluginbase.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri index 29e8eb3..c1aa4ef 100644 --- a/src/plugins/s60/s60pluginbase.pri +++ b/src/plugins/s60/s60pluginbase.pri @@ -1,6 +1,6 @@ # Note: These version based 'plugins' are not an actual Qt plugins, # they are just regular runtime loaded libraries -include(../../qpluginbase.pri) +include(../qpluginbase.pri) CONFIG -= plugin |